X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-zone-rrsig-expiration-many;h=cb8c41d9a663de94f16c142e53466b544056b278;hb=eb17713861edd0686880b3912543027ffa0eae8d;hp=4139b0da2e4261966e2efa2190544f23a1cedd69;hpb=b7c07e52588615db2511f455794a29d4dfbad1c0;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 4139b0d..cb8c41d 100755 --- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many +++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many @@ -120,15 +120,17 @@ for my $file (sort {$a cmp $b} (readdir INDIR)) { next unless ( -f "$file" ); my $do_dnssec = 1; + my $delegated = 1; my $initial_refs = undef; open(F, '<', $file) or die ("Cannot open $file: $!\n"); for () { if (/^; wzf:\s*dnssec\s*=\s*0\s*$/) { $do_dnssec = 0; } + if (/^; delegated\s*=\s*no\s*$/) { $delegated = 0; } if (/^; check-initial-refs\s*=\s*(.*?)\s*$/) { $initial_refs = $1; } }; close F; - if ($do_dnssec) { + if ($do_dnssec && $delegated) { die "Duplicate zone $file?\n" if exists $dnsseczones{$file}; $dnsseczones{$file} = {}; $dnsseczones{$file}->{'initial_refs'} = $initial_refs if defined $initial_refs;