--- logwatch-7.3.6/scripts/services/named	2010-10-09 17:10:21.000000000 +0100
+++ logwatch-7.3.6-fedora/scripts/services/named	2010-10-09 17:16:40.000000000 +0100
@@ -195,12 +195,10 @@
       ($ThisLine =~ /max open files \([0-9]*\) is smaller than max sockets \([0-9]*\)/) or
       ($ThisLine =~ /clients-per-query (?:de|in)creased to .*/) or
       ($ThisLine =~ /^must-be-secure resolving '.*': .*/) or
-      ($ThisLine =~ /^no valid DS resolving '.*': .*/) or
-      ($ThisLine =~ /^no valid KEY resolving '.*': .*/) or
-      ($ThisLine =~ /^no valid RRSIG resolving '.*': .*/) or
+      ($ThisLine =~ /^(error \()?no valid (DS|KEY|RRSIG)\)? resolving '.*': .*/) or
       ($ThisLine =~ /^not insecure resolving '.*': .*/) or
       ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/) or
-      ($ThisLine =~ /^broken trust chain resolving '.*': .*/)
+      ($ThisLine =~ /^(error \()?broken trust chain\)? resolving '.*': .*/)
       # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s)
    ) {
       # Don't care about these...
@@ -274,9 +272,10 @@
       $MasterFailure{"$Zone from $Host"}{$Reason}++;
    } elsif ( ($Zone) = ($ThisLine =~ /zone ([^\/]+)\/.+: refresh: non-authoritative answer from master/)) {
       $NonAuthoritative{$Zone}++;
-   } elsif ( ($ThisLine =~ /unexpected RCODE \((.*)\) resolving/) ){
+   } elsif ( ($ThisLine =~ /(?:error \()?unexpected RCODE\)? \(?(.*?)\)? resolving/) ){
       $UnexpRCODE{$1}++;
-   } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [.0-9a-fA-F:#]+/) ) {
+   } elsif ( ($ThisLine =~ /(?:error \()?FORMERR\)? resolving '[^ ]+: [.0-9a-fA-F:#]+/) or
+             ($ThisLine =~ /DNS format error from [^ ]+ resolving [^ ]+( for client [^ ]+)?: .*/) ) {
       chomp($ThisLine);
       $FormErr{$ThisLine}++;
    } elsif ( ($ThisLine =~ /found [0-9]* CPU(s)?, using [0-9]* worker thread(s)?/) ) {
@@ -300,9 +299,9 @@
       $UnknownCCCommands{$CCC}++;
    } elsif (($CCC) = ($ThisLine =~ /received control channel command '(.*)'/)) {
       $CCCommands{$CCC}++;
-   } elsif (($Name,$Address) = ($ThisLine =~ /network unreachable resolving '(.*)': (.*)/)) {
+   } elsif (($Name,$Address) = ($ThisLine =~ /(?:error \()?network unreachable\)? resolving '(.*)': (.*)/)) {
       $NUR{$Name}{$Address}++;
-   } elsif (($Name,$Address) = ($ThisLine =~ /host unreachable resolving '(.*)': (.*)/)) {
+   } elsif (($Name,$Address) = ($ThisLine =~ /(?:error \()?host unreachable\)? resolving '(.*)': (.*)/)) {
       $HUR{$Name}{$Address}++;
    } else {
       # Report any unmatched entries...