From 13f4bdc9b4f7b438cf5c2a071f108211534fae3f Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 20 Jan 2009 02:01:11 +0000 Subject: [PATCH] 2531. [bug] Change #2207 was incomplete. [RT #19098] --- CHANGES | 2 ++ bin/check/check-tool.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4f6ab39af3..489c801827 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +2531. [bug] Change #2207 was incomplete. [RT #19098] + 2530. [bug] named failed to reject insecure to secure transitions via UPDATE. [RT #19101] diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c index 081669cde1..0bad407aa7 100644 --- a/bin/check/check-tool.c +++ b/bin/check/check-tool.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: check-tool.c,v 1.37 2009/01/07 23:47:46 tbox Exp $ */ +/* $Id: check-tool.c,v 1.38 2009/01/20 02:01:11 marka Exp $ */ /*! \file */ @@ -218,8 +218,8 @@ checkns(dns_zone_t *zone, dns_name_t *name, dns_name_t *owner, while (cur != NULL && cur->ai_canonname == NULL && cur->ai_next != NULL) cur = cur->ai_next; - if (ai != NULL && cur->ai_canonname != NULL && - strcasecmp(ai->ai_canonname, namebuf) != 0 && + if (cur != NULL && cur->ai_canonname != NULL && + strcasecmp(cur->ai_canonname, namebuf) != 0 && !logged(namebuf, ERR_IS_CNAME)) { dns_zone_log(zone, ISC_LOG_ERROR, "%s/NS '%s' (out of zone) "