Commit 375e2c91 authored by Mark Andrews's avatar Mark Andrews
Browse files

2359. [bug] Fix NSID bug. [RT #17942]

parent 705671ff
2359. [bug] Fix NSID bug. [RT #17942]
2358. [doc] Update host's default query description. [RT #17934]
2357. [port] Don't use OpenSSL's engine support in versions before
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.366 2008/04/03 23:14:52 jinmei Exp $ */
/* $Id: resolver.c,v 1.367 2008/04/07 05:32:52 marka Exp $ */
/*! \file */
......@@ -1581,7 +1581,7 @@ resquery_send(resquery_t *query) {
unsigned int version = 0; /* Default version. */
unsigned int flags;
isc_uint16_t udpsize = res->udpsize;
isc_boolean_t reqnsid = ISC_FALSE;
isc_boolean_t reqnsid = res->view->requestnsid;
flags = query->addrinfo->flags;
if ((flags & DNS_FETCHOPT_EDNSVERSIONSET) != 0) {
......@@ -1596,8 +1596,6 @@ resquery_send(resquery_t *query) {
/* request NSID for current view or peer? */
if (peer != NULL)
(void) dns_peer_getrequestnsid(peer, &reqnsid);
reqnsid = (reqnsid || res->view->requestnsid);
result = fctx_addopt(fctx->qmessage, version,
udpsize, reqnsid);
if (reqnsid && result == ISC_R_SUCCESS) {
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.478 2008/04/03 05:55:52 marka Exp $ */
/* $Id: zone.c,v 1.479 2008/04/07 05:32:52 marka Exp $ */
/*! \file */
......@@ -6529,6 +6529,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
(void)dns_view_getpeertsig(zone->view, &masterip, &key);
have_xfrsource = ISC_FALSE;
reqnsid = zone->view->requestnsid;
if (zone->view->peers != NULL) {
dns_peer_t *peer = NULL;
isc_boolean_t edns;
......@@ -6546,9 +6547,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
udpsize =
dns_resolver_getudpsize(zone->view->resolver);
(void)dns_peer_getudpsize(peer, &udpsize);
result = dns_peer_getrequestnsid(peer, &reqnsid);
reqnsid = (result == ISC_R_SUCCESS && reqnsid) ||
zone->view->requestnsid;
(void)dns_peer_getrequestnsid(peer, &reqnsid);
}
}
......@@ -6761,6 +6760,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
if (key == NULL)
(void)dns_view_getpeertsig(zone->view, &masterip, &key);
reqnsid = zone->view->requestnsid;
if (zone->view->peers != NULL) {
dns_peer_t *peer = NULL;
isc_boolean_t edns;
......@@ -6778,9 +6778,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
udpsize =
dns_resolver_getudpsize(zone->view->resolver);
(void)dns_peer_getudpsize(peer, &udpsize);
result = dns_peer_getrequestnsid(peer, &reqnsid);
reqnsid = (result == ISC_R_SUCCESS && reqnsid) ||
zone->view->requestnsid;
(void)dns_peer_getrequestnsid(peer, &reqnsid);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment