diff options
| author | des <des@FreeBSD.org> | 2015-10-09 11:46:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2015-10-09 11:46:27 +0000 |
| commit | 4350483166edf73e4c775a1e8767e2d389f68600 (patch) | |
| tree | d5841ac00ebce6f3e8ae5f664970fb700c73fea3 /contrib/unbound/libunbound | |
| parent | 090c443c36e25180a32a3dbe90ba430a87c3b059 (diff) | |
| download | FreeBSD-src-4350483166edf73e4c775a1e8767e2d389f68600.zip FreeBSD-src-4350483166edf73e4c775a1e8767e2d389f68600.tar.gz | |
Upgrade to Unbound 1.5.5.
Diffstat (limited to 'contrib/unbound/libunbound')
| -rw-r--r-- | contrib/unbound/libunbound/libunbound.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/unbound/libunbound/libunbound.c b/contrib/unbound/libunbound/libunbound.c index b3a4c2b..7c2509b 100644 --- a/contrib/unbound/libunbound/libunbound.c +++ b/contrib/unbound/libunbound/libunbound.c @@ -65,6 +65,9 @@ #ifdef HAVE_PTHREAD #include <signal.h> #endif +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #if defined(UB_ON_WINDOWS) && defined (HAVE_WINDOWS_H) #include <windows.h> @@ -218,6 +221,12 @@ static void ub_stop_bg(struct ub_ctx* ctx) ub_thread_join(ctx->bg_tid); } else { lock_basic_unlock(&ctx->cfglock); +#ifndef UB_ON_WINDOWS + if(waitpid(ctx->bg_pid, NULL, 0) == -1) { + if(verbosity > 2) + log_err("waitpid: %s", strerror(errno)); + } +#endif } } else { @@ -946,7 +955,7 @@ ub_ctx_resolvconf(struct ub_ctx* ctx, const char* fname) while (ptr) { numserv++; if((retval=ub_ctx_set_fwd(ctx, - ptr->IpAddress.String)!=0)) { + ptr->IpAddress.String))!=0) { free(info); return retval; } |
