From: Tinderbox User Date: Fri, 5 Dec 2014 23:45:22 +0000 (+0000) Subject: update copyright notice / whitespace X-Git-Tag: v9.11.0a1~1192 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=dc5e29a7d216b4233c80bec8967015aa9c05962e;p=thirdparty%2Fbind9.git update copyright notice / whitespace --- diff --git a/CHANGES b/CHANGES index ab587701ee4..6c037b2d1fb 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,7 @@ [RT #37925] 4019. [func] If named is not configured to validate the answer - then allow fallback to plain DNS on timeout even + then allow fallback to plain DNS on timeout even when we know the server supports EDNS. [RT #37978] 4018. [placeholder] diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index f4ea6303f2e..621d7256de5 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -2354,7 +2354,7 @@ send_update(dns_name_t *zonename, isc_sockaddr_t *master) { isc_result_t result; dns_request_t *request = NULL; unsigned int options = DNS_REQUESTOPT_CASE; - isc_sockaddr_t *srcaddr; + isc_sockaddr_t *srcaddr; ddebug("send_update()"); @@ -2618,7 +2618,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) { memset(master_servers, 0, size); get_addresses(serverstr, dnsport, master_servers, master_total); master_inuse = 0; - } else + } else master_from_servers(); dns_rdata_freestruct(&soa);