summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-07-15 04:04:43 +0000
committerColin Walters <walters@verbum.org>2005-07-15 04:04:43 +0000
commit6be5b25a71ec6b4e7efb35f20fc1f5357be5cffb (patch)
treea3c66eb3e274774bac3de7228f0dbc3d63fae4ed
parentdc4d80e56775c1a69a51f196aec1bd331a645749 (diff)
2005-07-15 Colin Walters <walters@verbum.org>
* bus/selinux.c (bus_selinux_append_context): Wrap in HAVE_SELINUX.
-rw-r--r--ChangeLog5
-rw-r--r--bus/selinux.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fdd2f7bd..714e96a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15 Colin Walters <walters@verbum.org>
+
+ * bus/selinux.c (bus_selinux_append_context): Wrap in
+ HAVE_SELINUX.
+
2005-07-14 John (J5) Palmieri <johnp@redhat.com>
* python/_dbus.py (Bus::remove_signal_receiver):
diff --git a/bus/selinux.c b/bus/selinux.c
index 9e73cc63..2b88a60d 100644
--- a/bus/selinux.c
+++ b/bus/selinux.c
@@ -571,6 +571,7 @@ dbus_bool_t
bus_selinux_append_context (DBusMessage *message,
BusSELinuxID *context)
{
+#ifdef HAVE_SELINUX
/* Note if you change how the context is marshalled (e.g. to ay),
* you also need to change driver.c for the appropriate return value.
*/
@@ -578,6 +579,9 @@ bus_selinux_append_context (DBusMessage *message,
DBUS_TYPE_STRING,
SELINUX_SID_FROM_BUS (context),
DBUS_TYPE_INVALID);
+#else
+ return FALSE;
+#endif
}
/**