From: ianmdlvl <ianmdlvl>
Date: Wed, 27 Aug 2008 22:12:54 +0000 (+0000)
Subject: chiark-named-conf: Do not apply end-of-file foreign zone defaults
X-Git-Tag: debian_version_4_1_27~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=314ae7bf5c59154601b8267bd12457eb869cfc30

chiark-named-conf: Do not apply end-of-file foreign zone defaults
to explicitly named zones specified in a command line invocation.
(Fixes bug introduced in 4.1.26.)
---

diff --git a/debian/changelog b/debian/changelog
index 9da4db5..b11c86b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ chiark-utils (4.1.27) high; urgency=low
 
   * chiark-named-conf: Remove obsolete +nodebug option from calls
     to dig; required for BIND9 compatibility.  Thanks to Ross Younger.
+  * chiark-named-conf: Do not apply end-of-file foreign zone defaults
+    to explicitly named zones specified in a command line invocation.
+    (Fixes bug introduced in 4.1.26.)
   * Declare and document the dependency of hexterm on tcl8.4.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Wed, 27 Aug 2008 22:53:52 +0100
+ --
 
 chiark-utils (4.1.26) unstable; urgency=low
 
diff --git a/scripts/named-conf b/scripts/named-conf
index fc55b24..0108a74 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -425,12 +425,15 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {
-	$cfg= $zone_cfg{$zone} || {
-	    'style_p' => 'foreign',
-	    's' => "f $group2modcmd{'foreign'}",
-	    'servers' => [ ],
+	$cfg= $zone_cfg{$zone};
+	if (!$cfg) {
+	    $cfg= {
+		'style_p' => 'foreign',
+		's' => "f $group2modcmd{'foreign'}",
+		'servers' => [ ],
 	    };
-	zone_conf_settings($cfg, $zone);
+	    zone_conf_settings($cfg, $zone);
+	}
 
 	mail_zone_before() or next
 	    if $domail;