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 25f3366bc663c9b2f531076014376274f2f7de44..efbfd838034151ebce53caac4b684a616e86dc5a 100644 (file)
--- 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 4f6174da229be3bc61fb347756aaff19998e7603..70d756bcb4ff37be4b675051384f78d9d3efd4ec 100644 (file)
--- 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