logwatch/logwatch-7.3.6-named7.patch
2010-02-03 11:43:45 +00:00

48 lines
2.5 KiB
Diff

--- logwatch/scripts/services/named 2009-08-11 21:59:52.000000000 +1000
+++ named 2010-01-16 18:29:17.000000000 +1100
@@ -174,7 +174,7 @@
($ThisLine =~ /weak RSASHA1 \(5\) key found \(exponent=3\)/) or
($ThisLine =~ /Bad file descriptor/) or
($ThisLine =~ /open: .*: file not found/) or
- ($ThisLine =~ /queries: client [0-9.#:]* view localhost_resolver: query: .* IN .*/) or
+ ($ThisLine =~ /queries: client [.0-9a-fA-F#:]* view localhost_resolver: query: .* IN .*/) or
($ThisLine =~ /zone .*: NS '.*' is a CNAME \(illegal\)/) or
($ThisLine =~ /zone .*: zone serial unchanged. zone may fail to transfer to slaves/) or
($ThisLine =~ /zone .*: loading from master file .* failed/) or
@@ -252,7 +252,7 @@
} elsif ( ($Client) = ( $ThisLine =~ /client (.*)#\d+: query \(cache\) denied/ ) ) {
$FullClient = LookupIP ($Client);
$DeniedQuery{$FullClient}++;
- } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([\d\.]+)#\d+: update '(.*)' denied/)) {
+ } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([.0-9a-fA-F:]+)#\d+: update '(.*)' denied/)) {
$UpdateDenied{"$Rhost ($Ldom)"}++;
} elsif ( ($Zone) = ($ThisLine =~ /zone '([0-9a-zA-Z.-]+)' allows updates by IP address, which is insecure/)) {
$InsecUpdate{$Zone}++;
@@ -266,7 +266,7 @@
$NonAuthoritative{$Zone}++;
} elsif ( ($ThisLine =~ /unexpected RCODE \((.*)\) resolving/) ){
$UnexpRCODE{$1}++;
- } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [0-9.#]+/) ) {
+ } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [.0-9a-fA-F:#]+/) ) {
chomp($ThisLine);
$FormErr{$ThisLine}++;
} elsif ( ($ThisLine =~ /found [0-9]* CPU(s)?, using [0-9]* worker thread(s)?/) ) {
@@ -281,7 +281,7 @@
(($ErrorText) = ($ThisLine =~ /^(.* REQUIRE.* failed.*)$/)) or
(($ErrorText) = ($ThisLine =~ /(.*: fatal error)/)) ) {
$NError{$ErrorText}++;
- } elsif ( ($From,$Log) = ($ThisLine =~ /invalid command from ([.0-9]*)#[0-9]*: (.*)/) ) {
+ } elsif ( ($From,$Log) = ($ThisLine =~ /invalid command from ([.0-9a-fA-F:]*)#[0-9]*: (.*)/) ) {
$CCMessages{"$From,$Log"}++;
} elsif ( (($Log) = ($ThisLine =~ /(freezing .*zone.*)/)) or
(($Log) = ($ThisLine =~ /(thawing .*zone.*)/)) ) {
@@ -297,7 +297,7 @@
} else {
# Report any unmatched entries...
# remove PID from named messages
- $ThisLine =~ s/(client [.0-9]+)\S+/$1/;
+ $ThisLine =~ s/(client [.0-9a-fA-F:]+)\S+/$1/;
chomp($ThisLine);
$OtherList{$ThisLine}++;
}