From 66b71679b78ad6cf2c4e5c8c1216b602e0fe1e9b Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 20 Apr 2017 09:28:37 -0700
Subject: [PATCH] [master] nsupdate: send tkey queries to the right server
4588. [bug] nsupdate could send queries for TKEY to the wrong
server when using GSSAPI. Thanks to Tomas Hozza.
[RT #39893]
---
bin/nsupdate/nsupdate.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 9572fd8..8fc5b20 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -2799,10 +2799,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);
@@ -2947,11 +2945,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;
--
2.9.3