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

- Fix deadlock for local data add and zone add when unbound-control

Browse source 
list_local_data printout is interrupted.


git-svn-id: file:///svn/unbound/trunk@3476 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2015-08-24 10:49:28 +00:00
parent 954b212895
commit 9d9984a187
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/remote.c
View file

@ -2283,14 +2283,20 @@ do_list_local_data(SSL* ssl, struct worker* worker)
for(i=0; i<d->count + d->rrsig_count; i++) { for(i=0; i<d->count + d->rrsig_count; i++) {
if(!packed_rr_to_string(p->rrset, i, if(!packed_rr_to_string(p->rrset, i,
0, s, slen)) { 0, s, slen)) {
if(!ssl_printf(ssl, "BADRR\n")) if(!ssl_printf(ssl, "BADRR\n")) {
lock_rw_unlock(&z->lock);
lock_rw_unlock(&zones->lock);
return; return;
} }
if(!ssl_printf(ssl, "%s\n", s)) }
if(!ssl_printf(ssl, "%s\n", s)) {
lock_rw_unlock(&z->lock);
lock_rw_unlock(&zones->lock);
return; return;
} }
} }
} }
}
lock_rw_unlock(&z->lock); lock_rw_unlock(&z->lock);
} }
lock_rw_unlock(&zones->lock); lock_rw_unlock(&zones->lock);

4
doc/Changelog
View file

@ -1,3 +1,7 @@
24 August 2015: Wouter
- Fix deadlock for local data add and zone add when unbound-control
list_local_data printout is interrupted.
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.