rpms/logwatch/F-7 logwatch-7.3.4-pam_unix.patch, 1.1, 1.2 logwatch.spec, 1.69, 1.70

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17367

Modified Files:
	logwatch-7.3.4-pam_unix.patch logwatch.spec 
Log Message:
- fix pam_unix script output (#389311)


logwatch-7.3.4-pam_unix.patch:

Index: logwatch-7.3.4-pam_unix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-7/logwatch-7.3.4-pam_unix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.4-pam_unix.patch	8 Mar 2007 14:25:45 -0000	1.1
+++ logwatch-7.3.4-pam_unix.patch	22 Nov 2007 12:20:02 -0000	1.2
@@ -7,8 +7,8 @@
 +# $Id$
  ##########################################################################
  # $Log$
- # Revision 1.1  2007/03/08 14:25:45  varekova
- # - add pam_unix service patch
+ # Revision 1.2  2007/11/22 12:20:02  varekova
+ # - fix pam_unix script output (#389311)
  #
 -# Revision 1.29  2006/12/20 15:46:45  bjorn
 -# Additional filtering by Ivana Varekova.
@@ -83,19 +83,19 @@
 -     } else {
 +      if ($line =~ s/^session opened for user (.+)/$1/) {
 +         $data{$service}{'Sessions Opened'}{$line}++;
-+      } elsif ($line =~ s/^session closed for user (.+)/$1/) {
-+         $data{$service}{'Password Failures'}{$line}++;
++      } elsif ($line =~ /session closed for user/) {
++         # ignore this line
 +      } elsif ($line =~ /account (.+) has password changed in future/) {
 +      } else {
           $data{$service}{'Unknown Entries'}{$line}++;
 -     }
 -   } else {      
 +      }                                         
-+   } elsif ($service eq 'runuser') {
++   } elsif (($service eq 'runuser') or ($service eq 'runuser-l')) {
 +      if ($line =~ s/^session opened for user (.+)/$1/) {
 +         $data{$service}{'Sessions Opened'}{$line}++;
-+      } elsif ($line =~ s/^session closed for user (.+)/$1/) {
-+         $data{$service}{'Password Failures'}{$line}++;
++      } elsif ($line =~ /session closed for user/) {
++         # ignore this line
 +      } else {
 +           $data{$service}{'Unknown Entries'}{$line}++;                                                            
 +      }


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-7/logwatch.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- logwatch.spec	7 May 2007 12:59:27 -0000	1.69
+++ logwatch.spec	22 Nov 2007 12:20:02 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -151,6 +151,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Thu Nov 22 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-9
+- fix pam_unix script output (#389311)
+
 * Mon May  7 2007 Ivana Varekova <varekova at redhat.com> 7.3.4-8
 - add named and sshd service patches