From ff713d3ee7e2da6fae9251981bc67069a687bcf7 Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Sat, 1 Jun 2002 00:12:17 +0000
Subject: [PATCH]   * chiark-named-conf --mail-* works without zone list as
 args.   * chiark-named-conf --mail-* prints better output.

---
 debian/changelog   |  7 +++++++
 scripts/named-conf | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 426d4f4..fc44cda 100644
--- 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.
diff --git a/scripts/named-conf b/scripts/named-conf
index 50b7945..6ec87cb 100755
--- 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');
-process_zones($mode && !$domail ? @zone_cfg_list : @ARGV);
+process_zones(!@ARGV ? @zone_cfg_list : @ARGV);
 debug_dump('%output_contents');
 output_files() if $install;
 
@@ -780,7 +780,14 @@ sub mail_zone_after () {
 	} 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/;
@@ -890,8 +897,9 @@ END
     $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
-- 
2.30.2