* chiark-named-conf --mail-* works without zone list as args.

  * chiark-named-conf --mail-* prints better output.

diff --git a/debian/changelog b/debian/changelog
index 426d4f4d3e282d9b7b6c4164e174f7786378dc8e..fc44cdaff64cbf82b60471b7b71ca8da971ff23b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (2.2.6) unstable; urgency=low
+
+  * chiark-named-conf --mail-* works without zone list as args.
+  * chiark-named-conf --mail-* prints better output.
+
+ -- Ian Jackson <ian@chiark.greenend.org.uk>  Sat,  1 Jun 2002 01:12:00 +0100
+

 chiark-utils (2.2.4) unstable; urgency=low
 
   * chiark-named-conf can send mail reports, and is generally better.
 chiark-utils (2.2.4) unstable; urgency=low
 
   * chiark-named-conf can send mail reports, and is generally better.

diff --git a/scripts/named-conf b/scripts/named-conf
index 50b7945fb67965fa406df33cd5622322799c4198..6ec87cbc5811e0fb2ca64938753710c8325e26fc 100755 (executable)
--- a/scripts/named-conf
+++ b/scripts/named-conf
@@ -145,7 +145,7 @@ $install= $mode =~ m/^[yf]/;
 
 read_config($etcfile);
 debug_dump('@zone_cfg_list %zone_cfg');
 
 read_config($etcfile);
 debug_dump('@zone_cfg_list %zone_cfg');

-process_zones($mode && !$domail ? @zone_cfg_list : @ARGV);
+process_zones(!@ARGV ? @zone_cfg_list : @ARGV);

 debug_dump('%output_contents');
 output_files() if $install;
 
 debug_dump('%output_contents');
 output_files() if $install;
 


@@ -780,7 +780,14 @@ sub mail_zone_after () {
        } else {
            mail_zone_mail();
        }
        } else {
            mail_zone_mail();
        }

-    }      
+    } else {
+       printf " %-40s %d warns. OK %s Fail %s\n",
+           $zone,
+           defined $zone_warnings{$zone} ? $zone_warnings{$zone} : 0,
+           join(',', map { $_ - $m_time } @m_ok),
+           join(',', map { $_ - $m_time } @m_fail)
+               or die "$quis: checking progress report: $!\n";
+    }

 
     @m_fail= @m_ok= ('','')
        if $domail =~ m/^final/;
 
     @m_fail= @m_ok= ('','')
        if $domail =~ m/^final/;


@@ -890,8 +897,9 @@ END
     $r == $c or die "$quis: waitpid sendmail ($c): $r $!";
     $? and warn "$quis: sendmail failed: $?\n";
 
     $r == $c or die "$quis: waitpid sendmail ($c): $r $!";
     $? and warn "$quis: sendmail failed: $?\n";
 

-    printf " %-40s %s\n", $zone, $zone_to or
-       die "$quis: write mailing report: $!\n";
+    printf " %-40s %s\n", $zone,
+        length $zone_to ? $zone_to : 'reporting to admin'
+           or die "$quis: write mailing report: $!\n";

 }
 
 #-------------------- outputting
 }
 
 #-------------------- outputting