From: ianmdlvl <ianmdlvl>
Date: Wed, 2 Jan 2002 22:19:27 +0000 (+0000)
Subject: Output master IP addrs.
X-Git-Tag: debian_version_2_2_0~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=613808c5eb232d65bbb0c39e2effd86c6f3704c7;ds=sidebyside

Output master IP addrs.
---

diff --git a/scripts/named-conf b/scripts/named-conf
index f6c518b..3dfe87f 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -270,7 +270,8 @@ sub process_zones (@) {
 	    };
 	    zone_warning("checks failed: $@") if length $@;
 	}
-	zone_output() if $install;
+	$output_contents{$$cfg{'output'}} .= zone_output()
+	    if $install;
     }
     print STDERR "$quis: $warnings warnings\n" or die $!
 	if $warnings;
@@ -521,16 +522,18 @@ sub zone_server_simple ($$$) {
 #-------------------- outputting
 
 sub zone_output () {
-    $output_contents{$$cfg{'output'}}.=
-	sprintf(<<'END',
-zone "%s" {
-    type %s;
-    file "%s";
-};
-END
-		$zone,
-		$$cfg{'s'} =~ m/p/ ? 'master' : 'slave',
-		$$cfg{'file'});
+    my ($o);
+
+    $o= "zone \"$zone\" {\n";
+    if ($$cfg{'s'} =~ m/p/) {
+	$o.= "    type master\n";
+    } else {
+	$o.= "    type slave\n".
+	     "    masters {\n";
+	foreach $m (@{ $cfg{'servers'} }) { $o.= "        $m;\n"; }
+	$o.= "    };\n";
+    }
+    return $o;
 }
 
 sub output_files () {