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

Merge branch 'master' of github.com:NLnetLabs/unbound

Browse source
This commit is contained in:
W.C.A. Wijngaards 2020-04-16 11:48:53 +02:00
commit 2193d06af6
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,6 +1,9 @@
16 April 2020: Wouter 16 April 2020: Wouter
- Fix help return code in unbound-control-setup script. - Fix help return code in unbound-control-setup script.
15 April 2020: George
- Fix #220: auth-zone section in config may lead to segfault.
7 April 2020: Wouter 7 April 2020: Wouter
- Merge PR #214 from gearnode: unbound-control-setup recreate - Merge PR #214 from gearnode: unbound-control-setup recreate
certificates. With the -r option the certificates are created certificates. With the -r option the certificates are created

16
services/authzone.c
View file

@ -5334,7 +5334,7 @@ void auth_xfer_transfer_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
log_assert(xfr->task_transfer); log_assert(xfr->task_transfer);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_transfer->env; env = xfr->task_transfer->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return; /* stop on quit */ return; /* stop on quit */
} }
@ -5773,7 +5773,7 @@ auth_xfer_transfer_timer_callback(void* arg)
log_assert(xfr->task_transfer); log_assert(xfr->task_transfer);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_transfer->env; env = xfr->task_transfer->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return; /* stop on quit */ return; /* stop on quit */
} }
@ -5815,7 +5815,7 @@ auth_xfer_transfer_tcp_callback(struct comm_point* c, void* arg, int err,
log_assert(xfr->task_transfer); log_assert(xfr->task_transfer);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_transfer->env; env = xfr->task_transfer->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return 0; /* stop on quit */ return 0; /* stop on quit */
} }
@ -5896,7 +5896,7 @@ auth_xfer_transfer_http_callback(struct comm_point* c, void* arg, int err,
log_assert(xfr->task_transfer); log_assert(xfr->task_transfer);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_transfer->env; env = xfr->task_transfer->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return 0; /* stop on quit */ return 0; /* stop on quit */
} }
@ -6110,7 +6110,7 @@ auth_xfer_probe_timer_callback(void* arg)
log_assert(xfr->task_probe); log_assert(xfr->task_probe);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_probe->env; env = xfr->task_probe->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return; /* stop on quit */ return; /* stop on quit */
} }
@ -6146,7 +6146,7 @@ auth_xfer_probe_udp_callback(struct comm_point* c, void* arg, int err,
log_assert(xfr->task_probe); log_assert(xfr->task_probe);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_probe->env; env = xfr->task_probe->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return 0; /* stop on quit */ return 0; /* stop on quit */
} }
@ -6391,7 +6391,7 @@ void auth_xfer_probe_lookup_callback(void* arg, int rcode, sldns_buffer* buf,
log_assert(xfr->task_probe); log_assert(xfr->task_probe);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_probe->env; env = xfr->task_probe->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return; /* stop on quit */ return; /* stop on quit */
} }
@ -6468,7 +6468,7 @@ auth_xfer_timer(void* arg)
log_assert(xfr->task_nextprobe); log_assert(xfr->task_nextprobe);
lock_basic_lock(&xfr->lock); lock_basic_lock(&xfr->lock);
env = xfr->task_nextprobe->env; env = xfr->task_nextprobe->env;
if(env->outnet->want_to_quit) { if(!env || env->outnet->want_to_quit) {
lock_basic_unlock(&xfr->lock); lock_basic_unlock(&xfr->lock);
return; /* stop on quit */ return; /* stop on quit */
} }