SF.net SVN: logwatch:[164] scripts/services

Revision: 164
          http://sourceforge.net/p/logwatch/code/164
Author:   stefjakobs
Date:     2013-08-19 10:22:38 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
proftpd: fix pam_unix to handle proftpd sessions
         fix ftpd_xferlog to support TLS
         fix proftpd to report pam_unix sessions
         (thanks gulikoza)

Modified Paths:
--------------
    scripts/services/ftpd-xferlog
    scripts/services/pam_unix
    scripts/services/proftpd-messages

Modified: scripts/services/ftpd-xferlog
===================================================================
--- scripts/services/ftpd-xferlog	2013-08-19 10:17:44 UTC (rev 163)
+++ scripts/services/ftpd-xferlog	2013-08-19 10:22:38 UTC (rev 164)
@@ -49,7 +49,7 @@
 while (defined($ThisLine = <STDIN>)) {
    # Remove transfer time if it is there
    if ( ($RemoteHost,$Size,$FileName,$Direction,$AccessMode,$UserName) =
-         ( $ThisLine =~ /^([^ ]+) (\d+) (.*) . . (.) (.) (.*) ftp . .*$/ ) ) {
+         ( $ThisLine =~ /^([^ ]+) (\d+) (.*) . . (.) (.) (.*) ftps? . .*$/ ) ) {
       if ($Detail < 15) {
          $FileName = dirname($FileName);
       }

Modified: scripts/services/pam_unix
===================================================================
--- scripts/services/pam_unix	2013-08-19 10:17:44 UTC (rev 163)
+++ scripts/services/pam_unix	2013-08-19 10:22:38 UTC (rev 164)
@@ -163,7 +163,7 @@
    }
    #lowercase the service
    $service = lc($service);
-   if ( grep $_ eq $service, qw/ssh sshd login ftp vsftpd rsh remote rlogin rexec/) {
+   if ( grep $_ eq $service, qw/ssh sshd login ftp vsftpd proftpd rsh remote rlogin rexec/) {
       if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
 	 ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^session opened for user ([^ ]*) by ([^ ]*)\(uid=\d+\)/$1 by $2/) {

Modified: scripts/services/proftpd-messages
===================================================================
--- scripts/services/proftpd-messages	2013-08-19 10:17:44 UTC (rev 163)
+++ scripts/services/proftpd-messages	2013-08-19 10:22:38 UTC (rev 164)
@@ -80,6 +80,7 @@
          ( $ThisLine =~ /^FTP session closed/ ) or
          ( $ThisLine =~ /^(ANONYMOUS )?FTP login as \'.*\' from [^ ]+ \[.*\] to .*/ ) or
          ( $ThisLine =~ /(PAM|pam_unix)\(.*\): [Aa]uthentication failure/ ) or
+         ( $ThisLine =~ /(PAM|pam_unix)\(.*\): session (opened|closed) for user/ ) or
          ( $ThisLine =~ /^data_sendfile/ ) or
          ( $ThisLine =~ /(:| \-) FTP session (closed|opened)/ ) or
          ( $ThisLine =~ /(:| \-) No certificate files found/ ) or

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk