rpms/dbus/devel dbus-0.32-selinux_chroot_workaround.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16288

Modified Files:
	dbus-0.32-selinux_chroot_workaround.patch 
Log Message:
update patch

dbus-0.32-selinux_chroot_workaround.patch:
 selinux.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)

Index: dbus-0.32-selinux_chroot_workaround.patch
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus-0.32-selinux_chroot_workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbus-0.32-selinux_chroot_workaround.patch	12 Apr 2005 15:29:52 -0000	1.1
+++ dbus-0.32-selinux_chroot_workaround.patch	12 Apr 2005 15:50:46 -0000	1.2
@@ -1,6 +1,6 @@
---- dbus-0.32/bus/selinux.c.chroot_workaround	2005-04-12 11:23:44.612319000 -0400
-+++ dbus-0.32/bus/selinux.c	2005-04-12 11:24:18.527370000 -0400
-@@ -235,8 +235,15 @@
+--- selinux.c.~1.13.~	2005-02-07 00:31:59.000000000 -0500
++++ selinux.c	2005-04-12 11:50:08.000000000 -0400
+@@ -235,8 +235,18 @@ bus_selinux_pre_init (void)
                    _dbus_strerror (errno));
        return FALSE;
      }
@@ -9,11 +9,14 @@
 +   */
 +  if (security_getenforce () < 0 && errno == ENOENT)
 +    {
-+      return FALSE;
++      selinux_enabled = 0;
++    }
++  else
++    {
++      selinux_enabled = (r != 0);
 +    }
  
 -  selinux_enabled = r != 0;
-+  selinux_enabled = (r == 1);
    return TRUE;
  #else
    return TRUE;