upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-09 09:40:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v9_10] nsupdate: send tkey queries to the right server

Browse source 
4588.	[bug]		nsupdate could send queries for TKEY to the wrong
			server when using GSSAPI. Thanks to Tomas Hozza.
			[RT #39893]

(cherry picked from commit 66b71679b7)
This commit is contained in:
Evan Hunt 2017-04-20 09:30:08 -07:00
parent 0580a56901
commit c0f24a64e5
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4588. [bug] nsupdate could send queries for TKEY to the wrong
server when using GSSAPI. Thanks to Tomas Hozza.
[RT #39893]
4587. [bug] named-checkzone failed to handle occulted data below
DNAMEs correctly. [RT #44877]

10
bin/nsupdate/nsupdate.c
View file

@ -2751,10 +2751,8 @@ start_gssrequest(dns_name_t *master) {
if (kserver == NULL)
fatal("out of memory");
}
if (servers == NULL)
get_addresses(namestr, dnsport, kserver, 1);
else
memmove(kserver, &servers[ns_inuse], sizeof(isc_sockaddr_t));
memmove(kserver, &master_servers[master_inuse], sizeof(isc_sockaddr_t));
dns_fixedname_init(&fname);
servname = dns_fixedname_name(&fname);
@ -2899,11 +2897,11 @@ recvgss(isc_task_t *task, isc_event_t *event) {
}
if (eresult != ISC_R_SUCCESS) {
next_server("recvgss", addr, eresult);
next_master("recvgss", addr, eresult);
ddebug("Destroying request [%p]", request);
dns_request_destroy(&request);
dns_message_renderreset(tsigquery);
sendrequest(&servers[ns_inuse], tsigquery, &request);
sendrequest(&master_servers[master_inuse], tsigquery, &request);
isc_mem_put(gmctx, reqinfo, sizeof(nsu_gssinfo_t));
isc_event_free(&event);
return;