3018. [bug] Named failed to check for the "none;" acl when deciding

                        if a zone may need to be re-signed. RT #23120]

diff --git a/CHANGES b/CHANGES
index 2b4c946008a94e291eabdf5b7532578d7a1dfe71..2ea3540839b3aca7ca060799f8ec891ca0144a7e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3018.  [bug]           Named failed to check for the "none;" acl when deciding
+                       if a zone may need to be re-signed. RT #23120]
+
        --- 9.8.0rc1 released ---
 
 3017.  [doc]           dnssec-keyfromlabel -I was not properly documented.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 1e5b7c0856b2daff58e492a17664c887a69300f5..73f2ee9130daad32ba04f8cd160ec83adb07e641 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.582.8.1 2011/02/03 00:20:51 each Exp $ */
+/* $Id: zone.c,v 1.582.8.2 2011/02/07 00:14:30 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);
 }