From: Colin Walters <walters@verbum.org>
Date: Mon, 18 Oct 2004 13:06:41 +0000 (+0000)
Subject: 2004-10-18  Colin Walters  <walters@verbum.org>
X-Git-Tag: dbus-0.23~101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f79e96fc08734e92804f649b8cfb4bcead1f81a7;p=platform%2Fupstream%2Fdbus.git

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 021fe50..95a19b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
 	
 	* bus/selinux.c (bus_selinux_enabled): Implement it.
diff --git a/bus/selinux.c b/bus/selinux.c
index 0946caf..de68da3 100644
--- 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 */
 }
 
 /**