From c45d848e2a5898975a14a6311a406f45028a45b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tatuya=20JINMEI=20=E7=A5=9E=E6=98=8E=E9=81=94=E5=93=89?= Date: Wed, 14 Apr 2010 22:08:47 +0000 Subject: [PATCH] 2873. [bug] Canceling a dynamic update via the dns/client module could trigger an assertion failure. [RT #21133] --- CHANGES | 3 +++ lib/dns/client.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 30408ea6eb..cce109dae0 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 0256987463..0e9d1d9e2b 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 @@ -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);