2004-10-18 Colin Walters <walters@verbum.org>

	* bus/selinux.c (bus_selinux_enabled): Handle
	--disable-selinux case.

diff --git a/ChangeLog b/ChangeLog
index 021fe50b263222cb8af1e19e68853354d1d1a4e8..95a19b1314f37f5a2ff5fec7ad9ed78fd7d972a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Colin Walters  <walters@verbum.org>
+
+       * bus/selinux.c (bus_selinux_enabled): Handle
+       --disable-selinux case.
+       
 2004-10-18  Colin Walters  <walters@verbum.org>
 
        * bus/selinux.h: Add bus_selinux_enabled.

diff --git a/bus/selinux.c b/bus/selinux.c
index 0946caf92e9871c27d0d0bfb8c10358316fb0af8..de68da33166ff6050781571e4f42fc273b65aefb 100644 (file)
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -197,7 +197,11 @@ avc_free_lock (void *lock)
 dbus_bool_t
 bus_selinux_enabled (void)
 {
+#ifdef HAVE_SELINUX
   return selinux_enabled;
+#else
+  return FALSE;
+#endif /* HAVE_SELINUX */
 }
 
 /**