really: Document -R option in the manpage. Closes:#693354.

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

diff --git a/scripts/named-conf b/scripts/named-conf
index d6790773c16d70d1ab99237a8f4bc268e9a2e479..120f2b7a78f0fd1bbce7aea63bc3485c50384a88 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -425,12 +425,20 @@ sub process_zones (@) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {
     local ($zone,$cfg);
 
     foreach $zone (@zones) {

-       $cfg= $zone_cfg{$zone} || {
-           'style_p' => 'foreign',
-           's' => "f $group2modcmd{'foreign'}",
-           'servers' => [ ],
+       if ($zone =~ m/\.$/) {
+           zone_warning("zone specified with trailing dot -".
+                        " will not work", '');
+       }
+
+       $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;
 
        mail_zone_before() or next
            if $domail;


@@ -1106,7 +1114,7 @@ sub dig (&$$$) {
     if (!$c) {
        open STDERR, ">&STDOUT" or die $!;
        exec ('dig',
     if (!$c) {
        open STDERR, ">&STDOUT" or die $!;
        exec ('dig',

-             '+nodef','+nosea','+nodebug','+norecurse',
+             '+nodef','+nosea','+norecurse',

              "\@$qaddr",'-t',$qtype,$qowner);
        die "$quis: exec dig:\n $!\n";
     }
              "\@$qaddr",'-t',$qtype,$qowner);
        die "$quis: exec dig:\n $!\n";
     }