From: Tatuya JINMEI 神明達哉 <jinmei@isc.org>
Date: Wed, 14 Apr 2010 22:08:47 +0000 (+0000)
Subject: 2873.	[bug]		Canceling a dynamic update via the dns/client module
X-Git-Tag: v9.4-ESV-R2~5^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c45d848e2a5898975a14a6311a406f45028a45b0;p=thirdparty%2Fbind9.git

2873.	[bug]		Canceling a dynamic update via the dns/client module
			could trigger an assertion failure. [RT #21133]
---

diff --git a/CHANGES b/CHANGES
index 30408ea6eb0..cce109dae0b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2873.	[bug]		Canceling a dynamic update via the dns/client module
+			could trigger an assertion failure. [RT #21133]
+
 2872.	[bug]		Modify dns/client.c:dns_client_createx() to only
 			require one of IPv4 or IPv6 rather than both.
 			[RT #21122]
diff --git a/lib/dns/client.c b/lib/dns/client.c
index 02569874634..0e9d1d9e2b3 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.8 2010/04/13 23:50:58 tbox Exp $ */
+/* $Id: client.c,v 1.9 2010/04/14 22:08:47 jinmei Exp $ */
 
 #include <config.h>
 
@@ -2808,9 +2808,9 @@ dns_client_cancelupdate(dns_clientupdatetrans_t *trans) {
 		if (uctx->soareq != NULL)
 			dns_request_cancel(uctx->soareq);
 		if (uctx->restrans != NULL)
-			dns_client_cancelresolve(&uctx->restrans);
+			dns_client_cancelresolve(uctx->restrans);
 		if (uctx->restrans2 != NULL)
-			dns_client_cancelresolve(&uctx->restrans2);
+			dns_client_cancelresolve(uctx->restrans2);
 	}
 
 	UNLOCK(&uctx->lock);