rpms/pam/devel pam-0.99.8.1-audit-no-log.patch, 1.1, 1.2 pam.spec, 1.152, 1.153
Tomas Mraz (tmraz)
fedora-extras-commits at redhat.com
Mon Aug 13 09:05:08 UTC 2007
Author: tmraz
Update of /cvs/pkgs/rpms/pam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9880
Modified Files:
pam-0.99.8.1-audit-no-log.patch pam.spec
Log Message:
* Mon Aug 13 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-4
- fix auth regression when uid != 0 from previous build (#251804)
pam-0.99.8.1-audit-no-log.patch:
Index: pam-0.99.8.1-audit-no-log.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam-0.99.8.1-audit-no-log.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.99.8.1-audit-no-log.patch 6 Aug 2007 12:31:50 -0000 1.1
+++ pam-0.99.8.1-audit-no-log.patch 13 Aug 2007 09:05:04 -0000 1.2
@@ -1,26 +1,30 @@
diff -up Linux-PAM-0.99.8.1/libpam/pam_audit.c.no-log Linux-PAM-0.99.8.1/libpam/pam_audit.c
--- Linux-PAM-0.99.8.1/libpam/pam_audit.c.no-log 2007-07-18 10:53:35.000000000 +0200
-+++ Linux-PAM-0.99.8.1/libpam/pam_audit.c 2007-08-06 11:38:08.000000000 +0200
-@@ -42,18 +42,16 @@ _pam_audit_writelog(pam_handle_t *pamh,
++++ Linux-PAM-0.99.8.1/libpam/pam_audit.c 2007-08-13 10:59:40.000000000 +0200
+@@ -42,18 +42,17 @@ _pam_audit_writelog(pam_handle_t *pamh,
best to fix it. */
errno = -rc;
-+ pamh->audit_state |= PAMAUDIT_LOGGED;
-+
- if (rc < 0 && errno != old_errno)
- {
- old_errno = errno;
-+ if (rc == -EPERM && getuid () != 0)
-+ return 0;
- pam_syslog (pamh, LOG_CRIT, "audit_log_acct_message() failed: %m");
- }
--
-- pamh->audit_state |= PAMAUDIT_LOGGED;
+- if (rc < 0 && errno != old_errno)
+- {
+- old_errno = errno;
+- pam_syslog (pamh, LOG_CRIT, "audit_log_acct_message() failed: %m");
+- }
-
+ pamh->audit_state |= PAMAUDIT_LOGGED;
+
- if (rc == -EPERM && getuid () != 0)
- return 0;
- else
- return rc;
++ if (rc < 0) {
++ if (rc == -EPERM && getuid() != 0)
++ return 0;
++ if (errno != old_errno) {
++ old_errno = errno;
++ pam_syslog (pamh, LOG_CRIT, "audit_log_acct_message() failed: %m");
++ }
++ }
+ return rc;
}
Index: pam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam/devel/pam.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- pam.spec 6 Aug 2007 14:57:26 -0000 1.152
+++ pam.spec 13 Aug 2007 09:05:04 -0000 1.153
@@ -11,8 +11,10 @@
Summary: A security tool which provides authentication for applications
Name: pam
Version: 0.99.8.1
-Release: 3%{?dist}
-License: GPL or BSD
+Release: 4%{?dist}
+# The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
+# as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+
+License: BSD and GPLv2+
Group: System Environment/Base
Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
Source1: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2.sign
@@ -386,6 +388,9 @@
%doc doc/adg/*.txt doc/adg/html
%changelog
+* Mon Aug 13 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-4
+- fix auth regression when uid != 0 from previous build (#251804)
+
* Mon Aug 6 2007 Tomas Mraz <tmraz at redhat.com> 0.99.8.1-3
- updated db4 to 4.6.18 (#249740)
- added user and new instance parameters to namespace init
More information about the scm-commits
mailing list