From: Mark Andrews <marka@isc.org>
Date: Wed, 16 Mar 2005 01:02:33 +0000 (+0000)
Subject: 1815.   [bug]           nsupdate triggered a REQUIRE if the server was set
X-Git-Tag: v9.2.6b1~137^2~56
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0da70bc50a320a3bb16aa7cecb2727fed2c0683c;p=thirdparty%2Fbind9.git

1815.   [bug]           nsupdate triggered a REQUIRE if the server was set
                        without also setting the zone and it encountered
                        a CNAME and was using TSIG.  [RT #13086]
---

diff --git a/CHANGES b/CHANGES
index 25f3366bc66..efbfd838034 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,7 +35,9 @@
 
 1816.	[placeholder]	rt13597
 
-1815.	[placeholder]	rt13086
+1815.	[bug]		nsupdate triggered a REQUIRE if the server was set
+			without also setting the zone and it encountered
+			a CNAME and was using TSIG.  [RT #13086]
 
 1814.	[func]		UNIX domain controls are now supported.
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 4f6174da229..70d756bcb4f 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.135 2004/09/16 02:10:42 marka Exp $ */
+/* $Id: nsupdate.c,v 1.136 2005/03/16 01:02:33 marka Exp $ */
 
 #include <config.h>
 
@@ -1634,6 +1634,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		ddebug("Destroying request [%p]", request);
 		dns_request_destroy(&request);
 		dns_message_renderreset(soaquery);
+		dns_message_settsigkey(soaquery, NULL);
 		sendrequest(localaddr, &servers[ns_inuse], soaquery, &request);
 		isc_mem_put(mctx, reqinfo, sizeof(nsu_requestinfo_t));
 		isc_event_free(&event);
@@ -1813,6 +1814,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 	dns_name_clone(&tname, name);
 	dns_request_destroy(&request);
 	dns_message_renderreset(soaquery);
+	dns_message_settsigkey(soaquery, NULL);
 	if (userserver != NULL)
 		sendrequest(localaddr, userserver, soaquery, &request);
 	else