rpms/pam/FC-4 pam-0.79-selinux-nofail.patch, 1.1, 1.2 pam.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/pam/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31852

Modified Files:
	pam-0.79-selinux-nofail.patch pam.spec 
Log Message:
* Fri Jul 22 2005 Tomas Mraz <tmraz at redhat.com> 0.79-9.3
- more pam_selinux fixes for permissive policy (Dan Walsh)


pam-0.79-selinux-nofail.patch:
 pam_selinux.c |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

Index: pam-0.79-selinux-nofail.patch
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-4/pam-0.79-selinux-nofail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam-0.79-selinux-nofail.patch	19 Jul 2005 09:16:35 -0000	1.1
+++ pam-0.79-selinux-nofail.patch	22 Jul 2005 13:42:12 -0000	1.2
@@ -1,5 +1,5 @@
---- Linux-PAM-0.79/modules/pam_selinux/pam_selinux.c.nofail	2005-07-19 11:09:04.000000000 +0200
-+++ Linux-PAM-0.79/modules/pam_selinux/pam_selinux.c	2005-07-19 11:13:39.000000000 +0200
+--- Linux-PAM-0.79/modules/pam_selinux/pam_selinux.c.nofail	2005-07-19 11:15:17.000000000 +0200
++++ Linux-PAM-0.79/modules/pam_selinux/pam_selinux.c	2005-07-22 15:39:20.000000000 +0200
 @@ -425,12 +425,21 @@
      if (has_tty) {
        user_context = manual_context(pamh,username,debug);
@@ -39,3 +39,15 @@
    } else {
      if (debug)
        syslog(LOG_NOTICE, _("%s: set %s security context to %s"),MODULE, 
+@@ -516,7 +527,10 @@
+   if (status) {
+     syslog(LOG_ERR, _("Error!  Unable to set executable context %s."), 
+            prev_user_context);
+-    return PAM_AUTH_ERR;
++    if (security_getenforce() == 1)
++      return PAM_AUTH_ERR;
++    else
++      return PAM_SUCCESS;
+   }
+ 
+   if (debug)


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/FC-4/pam.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- pam.spec	19 Jul 2005 09:16:35 -0000	1.82
+++ pam.spec	22 Jul 2005 13:42:12 -0000	1.83
@@ -12,7 +12,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.79
-Release: 9.2
+Release: 9.3
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -382,6 +382,9 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
+* Fri Jul 22 2005 Tomas Mraz <tmraz at redhat.com> 0.79-9.3
+- more pam_selinux fixes for permissive policy (Dan Walsh)
+
 * Tue Jul 19 2005 Tomas Mraz <tmraz at redhat.com> 0.79-9.2
 - fixed module tests so the pam doesn't require itself to build (#163502)
 - added buildprereq for building the documentation (#163503)