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 9da4db55aa0d81b20e4eb727e81e46916fb8ce5a..b11c86bad4f35938787f94b3022168ed0c2f84bd 100644 (file)
--- 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 fc55b24f4e599a53b4abe543ec794cd8dff6fde1..0108a740780dbee5b677bbd6481dbeea44dc787b 100755 (executable)
--- 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;