From: Mark Andrews <marka@isc.org>
Date: Mon, 7 Feb 2011 00:10:36 +0000 (+0000)
Subject: CHANGES
X-Git-Tag: v9.7.3-P1~2^4~96
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=462a97981f8be6c01fa36e68663f5f85f2dbe1b2;p=thirdparty%2Fbind9.git

CHANGES
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 185b4278b11..7ca4a6d2cc3 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.583 2011/02/03 00:21:55 each Exp $ */
+/* $Id: zone.c,v 1.584 2011/02/07 00:10:36 marka Exp $ */
 
 /*! \file */
 
@@ -1599,7 +1599,8 @@ get_master_options(dns_zone_t *zone) {
 	if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_CHECKWILDCARD))
 		options |= DNS_MASTER_CHECKWILDCARD;
 	if (zone->type == dns_zone_master &&
-	    (zone->update_acl != NULL || zone->ssutable != NULL))
+	    ((zone->update_acl != NULL && !dns_acl_isnone(zone->update_acl)) ||
+	      zone->ssutable != NULL))
 		options |= DNS_MASTER_RESIGN;
 	return (options);
 }