X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=scripts%2Fnamed-conf;h=a031e32639306fc31a65fd775d2550a4e50e3bbb;hb=cc33952a152bf96d0a78491e93e54b0f0774575c;hp=5e694a347be88bba397bf1935c7885f5aae01aed;hpb=4187fdc83f9b19fc5024ded6f43186b9f5fd7908;p=chiark-utils.git

diff --git a/scripts/named-conf b/scripts/named-conf
index 5e694a3..a031e32 100755
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -65,22 +65,29 @@ usageerr("must specify either -f|-y|-n or zones (and not both)")
     if !!$mode == !!@ARGV;
 
 sub usageerr ($) {
-    die
-"$_[0]
-usage: named-conf-regen [options] -f|-y|-n|<zone>...\n".
-"operation modes:\n".
-" -f --force   install without checking\n".
-" -y --yes     check and install\n".
-" -n --no      check only\n".
-"additional options:\n".
-" -A --all       report on zones marked ? (ones we know are broken)\n".
-" -D             debug $quis (does not help debug your DNS config)\n".
-" -g --glueless  do not warn about any glueless referrals (not recommended)\n".
-" -l --localonly full checks only on zones which we primary\n".
-" -q --quiet     no output for OK zones\n".
-" -r --repeat    repeat warnings for all sources of imperfect data\n".
-" -v --verbose   extra verbose info about each zone\n".
-" -C|--config <DIR/FILE  use FILE as default config and DIR as default dir\n";
+    die <<END;
+$_[0]
+
+usage: chiark-named-conf [options] -f|-y|-n|<zone>...
+operation modes:
+ -f --force   install without checking
+ -y --yes     check and install
+ -n --no      check only (configured zones)
+ <zone> ...   check only (specified zones, even unconfigured ones)
+additional options:
+ -A --all       report on zones marked ? (ones we know are broken)
+ -D             debug $quis (does not help debug your DNS config)
+ -g --glueless  do not warn about any glueless referrals (not recommended)
+ -l --localonly full checks only on zones which we primary
+ -q --quiet     no output for OK zones
+ -r --repeat    repeat warnings for all sources of imperfect data
+ -v --verbose   extra verbose info about each zone
+ -C|--config <DIR/FILE  use FILE as default config and DIR as default dir
+
+chiark-named-conf is Copyright 2002 Ian Jackson.  It is Free software, under
+the GNU General Public License, and you are welcome to change it and/or
+distribute copies under certain conditions.  There is ABSOLUTELY NO WARRANTY.
+END
 }
 
 cfg_fail("config filename $etcfile should not be directory")
@@ -424,7 +431,9 @@ sub zone_check_nsrrset ($$$$) {
 			   @{ $cfg->{'conv_glueless'} };
 	    ($rcode,@glue)= lookup($s,'a','0',"glueless NS from $ww");
 	    foreach $a (@glue) {
-		zone_server_addr($a,$s,"glueless NS from $ww","NS [$uaddr]",0);
+		$wwn= "glueless NS from $ww";
+		push @to_check, $a, "$s, $wwn", $s, 0;
+		zone_server_addr($a,$s,$wwn,"NS [$uaddr]",0);
 	    }
 	}
 	$glue= join ' ', sort @glue;