upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Reap the child process that libunbound spawns.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3473 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-08-13 14:17:44 +00:00
parent 934954375e
commit 6da360d3bb
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,6 +1,7 @@
13 August 2015: Wouter 13 August 2015: Wouter
- 5011 implementation does not insist on all algorithms, when - 5011 implementation does not insist on all algorithms, when
harden-algo-downgrade is turned off. harden-algo-downgrade is turned off.
- Reap the child process that libunbound spawns.
11 August 2015: Wouter 11 August 2015: Wouter
- Fix #694: configure script does not detect LibreSSL 2.2.2 - Fix #694: configure script does not detect LibreSSL 2.2.2

5
libunbound/libunbound.c
View file

@ -65,6 +65,7 @@
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
#include <signal.h> #include <signal.h>
#endif #endif
#include <sys/wait.h>
#if defined(UB_ON_WINDOWS) && defined (HAVE_WINDOWS_H) #if defined(UB_ON_WINDOWS) && defined (HAVE_WINDOWS_H)
#include <windows.h> #include <windows.h>
@ -218,6 +219,10 @@ static void ub_stop_bg(struct ub_ctx* ctx)
ub_thread_join(ctx->bg_tid); ub_thread_join(ctx->bg_tid);
} else { } else {
lock_basic_unlock(&ctx->cfglock); lock_basic_unlock(&ctx->cfglock);
if(waitpid(ctx->bg_pid, NULL, 0) == -1) {
if(verbosity > 2)
log_err("waitpid: %s", strerror(errno));
}
} }
} }
else { else {