rpms/gdm/devel gdm-2.8.0.2-fix-selinux-check.patch,1.3,1.4

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3893

Modified Files:
	gdm-2.8.0.2-fix-selinux-check.patch 
Log Message:
More fixups for getseusername patch

gdm-2.8.0.2-fix-selinux-check.patch:
 slave.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

Index: gdm-2.8.0.2-fix-selinux-check.patch
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.8.0.2-fix-selinux-check.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdm-2.8.0.2-fix-selinux-check.patch	14 Oct 2005 12:14:39 -0000	1.3
+++ gdm-2.8.0.2-fix-selinux-check.patch	18 Oct 2005 19:03:17 -0000	1.4
@@ -1,10 +1,10 @@
 --- gdm-2.8.0.4/daemon/slave.c.fix-selinux-check	2005-08-20 14:39:33.000000000 -0400
 +++ gdm-2.8.0.4/daemon/slave.c	2005-10-14 08:12:15.000000000 -0400
-@@ -3593,17 +3593,25 @@
+@@ -3593,17 +3593,23 @@
  gdm_selinux_setup (const char *login)
  {
  	security_context_t scontext;
-+	int ret=0;
++	int ret=-1;
 +	char *seuser=NULL;
 +	char *level=NULL;
  
@@ -16,8 +16,6 @@
 -	if (get_default_context((char*) login,0, &scontext) < 0) {
 +	if (getseuserbyname(login, &seuser, &level) == 0)
 +		ret=get_default_context_with_level(seuser, level, 0, &scontext);
-+	else
-+		ret= get_default_context(login, 0, &scontext);
 +
 +	if ( ret < 0) {
  		gdm_error ("SELinux gdm login: unable to obtain default security context for %s.", login);
@@ -29,7 +27,7 @@
  	}
  
  	gdm_assert (scontext != NULL);
-@@ -3613,7 +3621,8 @@
+@@ -3613,7 +3619,8 @@
  			  (char *)scontext);
  		gdm_fdprintf (2, "SELinux gdm login: unable to set executable context %s.",
  			      (char *)scontext);