rpms/pam/devel pam-0.80-selinux-nofail.patch, 1.3, 1.4 pam.spec, 1.92, 1.93

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	pam-0.80-selinux-nofail.patch pam.spec 
Log Message:
* Fri Oct 14 2005 Dan Walsh <dwalsh at redhat.com> 0.80-11
- Eliminate fail over for getseuserbyname call


pam-0.80-selinux-nofail.patch:
 pam_selinux.c |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

Index: pam-0.80-selinux-nofail.patch
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam-0.80-selinux-nofail.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pam-0.80-selinux-nofail.patch	13 Oct 2005 21:10:48 -0000	1.3
+++ pam-0.80-selinux-nofail.patch	18 Oct 2005 15:41:53 -0000	1.4
@@ -1,5 +1,5 @@
 --- Linux-PAM-0.80/modules/pam_selinux/pam_selinux.c.nofail	2005-06-09 05:45:44.000000000 -0400
-+++ Linux-PAM-0.80/modules/pam_selinux/pam_selinux.c	2005-10-04 15:39:48.000000000 -0400
++++ Linux-PAM-0.80/modules/pam_selinux/pam_selinux.c	2005-10-14 14:05:08.000000000 -0400
 @@ -389,6 +389,8 @@
    int num_contexts = 0;
    const void *username = NULL;
@@ -9,7 +9,7 @@
  
    /* Parse arguments. */
    for (i = 0; i < argc; i++) {
-@@ -423,7 +425,21 @@
+@@ -423,7 +425,19 @@
                     username == NULL) {
      return PAM_AUTH_ERR;
    }
@@ -27,12 +27,10 @@
 +	  free(seuser);
 +	  free(level);
 +  }
-+  else
-+	  num_contexts = get_ordered_context_list(username, NULL, &contextlist);
    if (num_contexts > 0) {
      if (multiple && (num_contexts > 1) && has_tty) {
        user_context = select_context(pamh,contextlist, debug);
-@@ -438,13 +454,19 @@
+@@ -438,13 +452,19 @@
        if (user_context == NULL) {
  	syslog (LOG_ERR, _("Unable to get valid context for %s"),
  		(const char *)username);
@@ -54,7 +52,7 @@
      }
    }
    if (getexeccon(&prev_user_context)<0) {
-@@ -481,8 +503,10 @@
+@@ -481,8 +501,10 @@
    if (ret) {
      syslog(LOG_ERR, _("Error!  Unable to set %s executable context %s."),
             (const char *)username, user_context);
@@ -67,7 +65,7 @@
    } else {
      if (debug)
        syslog(LOG_NOTICE, _("%s: set %s security context to %s"),MODULE,
-@@ -530,7 +554,10 @@
+@@ -530,7 +552,10 @@
    if (status) {
      syslog(LOG_ERR, _("Error!  Unable to set executable context %s."),
             prev_user_context);


Index: pam.spec
===================================================================
RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- pam.spec	13 Oct 2005 21:36:33 -0000	1.92
+++ pam.spec	18 Oct 2005 15:41:53 -0000	1.93
@@ -11,7 +11,7 @@
 Summary: A security tool which provides authentication for applications.
 Name: pam
 Version: 0.80
-Release: 10
+Release: 11
 License: GPL or BSD
 Group: System Environment/Base
 Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2
@@ -375,7 +375,10 @@
 %{_libdir}/libpam_misc.so
 
 %changelog
-* Thu Oct 13 2005 Dan Walsh <dwalsh at redhat.com> 0.80-11
+* Fri Oct 14 2005 Dan Walsh <dwalsh at redhat.com> 0.80-11
+- Eliminate fail over for getseuserbyname call
+
+* Thu Oct 13 2005 Dan Walsh <dwalsh at redhat.com> 0.80-10
 - Add getseuserbyname call for SELinux MCS/MLS policy
 
 * Tue Oct  4 2005 Tomas Mraz <tmraz at redhat.com>