From: ianmdlvl <ianmdlvl>
Date: Wed, 2 Jan 2002 22:58:29 +0000 (+0000)
Subject: Bugfixes.
X-Git-Tag: debian_version_2_2_0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=104ec3d498226ed072d991f03c641fc45d92a1ca

Bugfixes.
---

diff --git a/scripts/named-conf b/scripts/named-conf
index 3dfe87f..047e9ea 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -177,6 +177,8 @@ sub read_config ($) {
 	    zone_conf($2,'stealth','u',$1,'',split /\s+/, $3);
 	} elsif (m/^slave\-dir\s+(\S+)(?:(?:\s+(\S+))\s+(\S+))?$/) {
 	    ($slave_dir, $slave_prefix, $slave_suffix) = (qualify($1),$2,$3);
+	    $slave_prefix='' if !defined $slave_prefix;
+	    $slave_suffix='' if !defined $slave_suffix;
 	} elsif (m/^output\s+bind8\+(\S+)$/) {
 	    cfg_fail("default output may not apply to only some zones")
 		if @zone_cfg_list && length $default_output;
@@ -522,17 +524,19 @@ sub zone_server_simple ($$$) {
 #-------------------- outputting
 
 sub zone_output () {
-    my ($o);
+    my ($o,$m);
 
     $o= "zone \"$zone\" {\n";
     if ($$cfg{'s'} =~ m/p/) {
-	$o.= "    type master\n";
+	$o.= "    type master;\n";
     } else {
-	$o.= "    type slave\n".
+	$o.= "    type slave;\n".
 	     "    masters {\n";
-	foreach $m (@{ $cfg{'servers'} }) { $o.= "        $m;\n"; }
+	foreach $m (@{ $$cfg{'servers'} }) { $o.= "        $m;\n"; }
 	$o.= "    };\n";
     }
+    $o.= "    file \"$$cfg{'file'}\";\n";
+    $o.= "};\n";
     return $o;
 }