chiark-named-conf: Do not apply end-of-file foreign zone defaults

[chiark-utils.git] / scripts / named-conf

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;