X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-zone-rrsig-expiration-many;h=ec97557daf1477e91c0db2de9dd37b17fcc353ff;hb=2561b0ac2dc1acd63f2fb76fa3229520d88c734f;hp=1307847d0850f39a1d4d7802e99ff4f82b4487a7;hpb=49e20df61bb5efe05d0e6b2b817ded7d3b18ae3d;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
index 1307847..ec97557 100755
--- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
+++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
@@ -66,9 +66,13 @@ sub check_one {
 
 	my $zone = shift;
 	my $check = shift;
+	my $extra = shift;
 	my $params = shift;
 
-	open(P, '-|', ($check, '-w', $params->{'warn'}, '-c', $params->{'critical'}, $zone)) or die ("Cannot run $CHECK for $zone\n");
+	my @cmd = ($check, '-w', $params->{'warn'}, '-c', $params->{'critical'});
+	push(@cmd, '-r', $extra->{'initial_refs'}) if exists $extra->{'initial_refs'};
+	push(@cmd, $zone);
+	open(P, '-|', @cmd) or die ("Cannot run $CHECK for $zone\n");
 	my @p = <P>;
 	close P;
 	$p[0] = $zone.': '. $p[0] if (scalar @p > 0);
@@ -105,24 +109,27 @@ my $count =
 	};
 
 
-my @dnsseczones;
+my %dnsseczones;
 # load list of classic zones that will do DNSSEC
 chdir $INDIR or die "chdir $INDIR failed? $!\n";
 opendir INDIR, '.' or die ("Cannot opendir $INDIR\n");
 for my $file (sort {$a cmp $b} (readdir INDIR)) {
 	next if ( -l "$file" );
 	next unless ( -f "$file" );
-	next if $file =~ /^(dsset|keyset)-/;
 
-	my $do_dnssec = 0;
+	my $do_dnssec = 1;
+	my $initial_refs = undef;
 	open(F, '<', $file) or die ("Cannot open $file: $!\n");
 	for (<F>) {
-		if (/^; wzf:\s*dnssec\s*=\s*1\s*$/) { $do_dnssec = 1; last; }
+		if (/^; wzf:\s*dnssec\s*=\s*0\s*$/) { $do_dnssec = 0; }
+		if (/^; check-initial-refs\s*=\s*(.*?)\s*$/) { $initial_refs = $1; }
 	};
 	close F;
 
 	if ($do_dnssec) {
-		push @dnsseczones, $file;
+		die "Duplicate zone $file?\n" if exists $dnsseczones{$file};
+		$dnsseczones{$file} = {};
+		$dnsseczones{$file}->{'initial_refs'} = $initial_refs if defined $initial_refs;
 	} else {
 		push @{$count->{'unsigned'}}, $file;
 	};
@@ -136,17 +143,9 @@ if (defined $params->{'geozonedir'}) {
 	for my $file (sort {$a cmp $b} (readdir INDIR)) {
 		next unless $file =~ /\.zone$/;
 
-		open (F, '<', $file) or die "Cannot open $file: $!\n";
-		my ($zc, undef, undef) = Load(join "", (<F>));
-		close F;
-
 		my $zone = basename($file, '.zone');
-
-		if ($zc->{'dnssec'}) {
-			push @dnsseczones, $zone;
-		} else {
-			push @{$count->{'unsigned'}}, $zone;
-		};
+		die "Duplicate zone $zone?\n" if exists $dnsseczones{$zone};
+		$dnsseczones{$zone} = {};
 	}
 	closedir(INDIR);
 }
@@ -154,10 +153,10 @@ if (defined $params->{'geozonedir'}) {
 my @details;
 
 my %threads;
-for my $zone (sort {$a cmp $b} @dnsseczones) {
+for my $zone (sort {$a cmp $b} keys %dnsseczones) {
 	die "Duplicate zone $zone?\n"  if defined $threads{$zone};
 	my $thr = threads->create({'context' => 'list'},
-	                          \&check_one, $zone, $CHECK, $params);
+	                          \&check_one, $zone, $CHECK, $dnsseczones{$zone}, $params);
 	$threads{$zone} = $thr;
 }
 
@@ -188,7 +187,7 @@ for my $k (keys %$count) {
 	@{$count->{$k}} = sort {$a cmp $b} @{$count->{$k}};
 }
 
-my $exit;
+my $exit = 0;
 my %state_mapping = (
 	'unknown' => 255,
 	'critical' => 2,