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

if a zone may need to be re-signed. RT #23120]
This commit is contained in:
Mark Andrews 2011-02-07 00:16:48 +00:00
parent 0b034daf8e
commit bc7aed2a6b
2 changed files with 6 additions and 2 deletions

View file

@ -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]
3017. [doc] dnssec-keyfromlabel -I was not properly documented.
[RT #22887]

View file

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: zone.c,v 1.540.2.36 2011/02/03 05:38:10 tbox Exp $ */
/* $Id: zone.c,v 1.540.2.37 2011/02/07 00:16:48 marka Exp $ */
/*! \file */
@ -1590,7 +1590,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);
}