| Newsgroups |
gmane.comp.log.logwatch.devel |
| Message-ID |
<[email protected]> |
Revision: 89
http://logwatch.svn.sourceforge.net/logwatch/?rev=89&view=rev
Author: stefjakobs
Date: 2012-04-12 22:04:29 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Include Debian Patches:
* 0003-services-dpkg-Support-the-new-format-for-remove-line
* 0004-Remove-final-white-space-from-logwatch-text-output
* 0005-zz-disk_space-Support-GNU-kFreeBSD
* 0007-Bug618604-Support-some-kerberos-lines-in-secure
* 0008-Bug649194-Handle-unmatched-entry-in-saslauthd
Modified Paths:
--------------
scripts/logwatch.pl
scripts/services/dpkg
scripts/services/saslauthd
scripts/services/secure
scripts/services/zz-disk_space
Modified: scripts/logwatch.pl
===================================================================
--- scripts/logwatch.pl 2012-04-10 13:17:04 UTC (rev 88)
+++ scripts/logwatch.pl 2012-04-12 22:04:29 UTC (rev 89)
@@ -1520,7 +1520,7 @@
if ( $type eq "line" ) {
if ( $Config{'format'} eq "text" ) {
- $out_body{$index} .= "$text ";
+ $out_body{$index} .= " $text";
} elsif ( $Config{'format'} eq "html" ) {
#Covert spaces
$text =~ s/ / \ /go;
Modified: scripts/services/dpkg
===================================================================
--- scripts/services/dpkg 2012-04-10 13:17:04 UTC (rev 88)
+++ scripts/services/dpkg 2012-04-12 22:04:29 UTC (rev 89)
@@ -53,7 +53,7 @@
while(my $line=<STDIN>) {
chomp $line;
if ( my ( $do, $pkg, $ver1, $ver2) = ( $line =~ /^\S+ \S+ (install|upgrade|remove|purge) (\S+) (\S+)(?: (\S+))?/ )) {
- if(($do eq "remove" or $do eq "purge") and ($ver1 ne $ver2)) {
+ if(($do eq "remove" or $do eq "purge") and ($ver1 ne $ver2) and ($ver2 !~ /^<\w+>$/ )) {
push @unknown, $line;
} elsif ($do eq "remove") {
push @remove, "$pkg $ver1";
Modified: scripts/services/saslauthd
===================================================================
--- scripts/services/saslauthd 2012-04-10 13:17:04 UTC (rev 88)
+++ scripts/services/saslauthd 2012-04-12 22:04:29 UTC (rev 89)
@@ -61,6 +61,7 @@
if (
( $ThisLine =~ m/^DEBUG: / ) or
( $ThisLine =~ m/^ipc_init : listening on socket:/ ) or
+ ( $ThisLine =~ m/^pam_sm_authenticate:/ ) or
( $ThisLine =~ m/^pam_unix/ )
) {
# We don't care about these
Modified: scripts/services/secure
===================================================================
--- scripts/services/secure 2012-04-10 13:17:04 UTC (rev 88)
+++ scripts/services/secure 2012-04-12 22:04:29 UTC (rev 89)
@@ -482,6 +482,28 @@
$DeniedAccess{"$User,$Reason"}++;
} elsif ($ThisLine =~ /^request-key: Cannot find command to construct key/) {
$RequestKeyFailures++;
+ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (ISSUE|UNKNOWN_SERVER): authtime [0-9]+, (?:etypes {rep=[0-9]+ tkt=[0-9]+ ses=[0-9]+},)? ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ if($service=~/^krbtgt\/([^@]+)@\1/) {
+ $service='Login';
+ }
+ if($response eq 'UNKNOWN_SERVER' && $e eq 'Server not found in Kerberos database') {
+ $response=$e;
+ $e='';
+ }
+ $KerbList{$response}{$type}{$from}{$service}{$client}{$e}++;
+ } elsif (my ($type,$from,$response,$client,$service,$e) = ($ThisLine =~ /krb5kdc\[[0-9]*\]: (AS_REQ|TGS_REQ) \([0-9]+ etypes {[ 0-9]+}\) ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+): (NEEDED_PREAUTH|PREAUTH_FAILED|CLIENT_NOT_FOUND): ([^ ]+) for ([^ ,]+)(?:, )?(.*)$/)) {
+ if($service=~/^krbtgt\/([^@]+)@\1/) {
+ $service='Login';
+ }
+ if($response eq 'CLIENT_NOT_FOUND' && $e eq 'Client not found in Kerberos database') {
+ $response=$e;
+ $e='';
+ } elsif($response eq 'NEEDED_PREAUTH' && $e eq 'Additional pre-authentication required') {
+ next unless($Detail > 9||$type ne 'AS_REQ');
+ $response=$e;
+ $e='';
+ }
+ $KerbList{$response}{$type}{$from}{$service}{$client}{$e}++;
} else {
# Unmatched entries...
$ThisLine =~ s/\[\d+\]:/:/;
@@ -838,6 +860,32 @@
print "\nRequest Key Failures (nfs-utils/kernel mismatch): $RequestKeyFailures Time(s)\n";
}
+if (keys %KerbList) {
+ print "\nKerberos Entries:\n";
+ foreach my $response (sort {$a cmp $b} keys %KerbList) {
+ print " $response:\n";
+ foreach my $type (sort {$a cmp $b} keys %{$KerbList{$response}}) {
+ print " $type:\n";
+ foreach my $from (sort {$a cmp $b} keys %{$KerbList{$response}{$type}}) {
+ print " $from:\n";
+ foreach my $service (sort {$a cmp $b} keys %{$KerbList{$response}{$type}{$from}}) {
+ print " $service:\n";
+ foreach my $client (sort {$a cmp $b} keys %{$KerbList{$response}{$type}{$from}{$service}}) {
+ if(scalar(keys %{$KerbList{$response}{$type}{$from}{$service}{$client}})==1&&defined($KerbList{$response}{$type}{$from}{$service}{$client}{''})){
+ print " $client: $KerbList{$response}{$type}{$from}{$service}{$client}{''} Time(s)\n";
+ }else{
+ print " $client:\n";
+ foreach my $e (sort {$a cmp $b} keys %{$KerbList{$response}{$type}{$from}{$service}{$client}}) {
+ print " $e: $KerbList{$response}{$type}{$from}{$service}{$client}{$e} Time(s)\n";
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
if (keys %OtherList) {
print "\n**Unmatched Entries**\n";
foreach $line (sort {$a cmp $b} keys %OtherList) {
Modified: scripts/services/zz-disk_space
===================================================================
--- scripts/services/zz-disk_space 2012-04-10 13:17:04 UTC (rev 88)
+++ scripts/services/zz-disk_space 2012-04-12 22:04:29 UTC (rev 89)
@@ -145,6 +145,8 @@
$df_options = "-l";
} elsif ($OSname eq "AIX") {
$df_options = "-P";
+ } elsif ($OSname eq "GNU/kFreeBSD") {
+ $df_options = "-h -l -x tmpfs -x udf -x iso9660 -x devfs -x linprocfs -x sysfs -x fdescfs";
} else {
$df_options = "-l";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2