rpms/gdm/devel gdm-2.8.0.2-fix-selinux-check.patch, 1.1, 1.2 gdm.spec, 1.94, 1.95

[fedora-cvs-commits at redhat.com]

Author: dwalsh

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

Modified Files:
	gdm-2.8.0.2-fix-selinux-check.patch gdm.spec 
Log Message:
* Thu Sep 28 2005 Dan Walsh <dwalsh at redhat.com> 1:2.8.0.4-3
- Fix selinux not to fail when in permissive mode


gdm-2.8.0.2-fix-selinux-check.patch:
 slave.c |    5 +++--
 1 files changed, 3 insertions(+), 2 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.8.0.2-fix-selinux-check.patch	19 Aug 2005 21:36:39 -0000	1.1
+++ gdm-2.8.0.2-fix-selinux-check.patch	28 Sep 2005 18:21:25 -0000	1.2
@@ -1,12 +1,21 @@
---- gdm-2.8.2/daemon/slave.c.selinux	2004-03-04 13:46:28.000000000 -0500
-+++ gdm-2.8.2/daemon/slave.c	2004-03-16 22:22:34.494921136 -0500
-@@ -3380,7 +3380,7 @@
- 	security_context_t scontext;
+--- 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-09-28 14:21:59.000000000 -0400
+@@ -3603,7 +3603,7 @@
+ 		/* note that this will be run when the .xsession-errors
+ 		   is already being logged, so we can use stderr */
+ 		gdm_fdprintf (2, "SELinux gdm login: unable to obtain default security context for %s.", login);
+-		return FALSE;
++		return (security_getenforce()==0);
+ 	}
  
- 	/* If selinux is not enabled, then we don't do anything */
--	if ( ! is_selinux_enabled ())
-+	if (is_selinux_enabled () <= 0)
- 		return TRUE;
+ 	gdm_assert (scontext != NULL);
+@@ -3613,7 +3613,8 @@
+ 			  (char *)scontext);
+ 		gdm_fdprintf (2, "SELinux gdm login: unable to set executable context %s.",
+ 			      (char *)scontext);
+-		return FALSE;
++		freecon (scontext);
++		return (security_getenforce()==0);
+ 	}
  
- 	if (get_default_context((char*) login,0, &scontext) < 0) {
-
+ 	freecon (scontext);


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- gdm.spec	27 Sep 2005 16:40:40 -0000	1.94
+++ gdm.spec	28 Sep 2005 18:21:25 -0000	1.95
@@ -9,14 +9,11 @@
 %define pam_version 0.75
 %define desktop_file_utils_version 0.2.90
 %define gail_version 1.2.0
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
 
 Summary: The GNOME Display Manager.
 Name: gdm
 Version: 2.8.0.4
-Release: 2
+Release: 3
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -79,10 +76,7 @@
 BuildRequires: libcroco-devel
 BuildRequires: libattr-devel
 BuildRequires: gettext 
-
-%if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
-%endif
 
 %description
 Gdm (the GNOME Display Manager) is a highly configurable
@@ -120,11 +114,7 @@
 autoconf
 autoheader
 %configure --prefix=%{_prefix} --sysconfdir=/etc/X11 --with-pam-prefix=/etc --localstatedir=/var --enable-console-helper --disable-scrollkeeper \
-%if %{WITH_SELINUX}
 --with-selinux
-%else
---without-selinux
-%endif
 make
 
 %install
@@ -273,6 +263,9 @@
 %attr(1770, root, gdm) %dir %{_localstatedir}/gdm
 
 %changelog
+* Thu Sep 28 2005 Dan Walsh <dwalsh at redhat.com> 1:2.8.0.4-3
+- Fix selinux not to fail when in permissive mode
+
 * Thu Sep 27 2005 Ray Strode <rstrode at redhat.com> 1:2.8.0.4-2
 - remove flexiserver from menus