dbus/bus selinux.c,1.15,1.16

Colin Walters walters at freedesktop.org
Fri Jul 15 14:04:46 EST 2005


Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv28595/bus

Modified Files:
	selinux.c 
Log Message:
2005-07-15  Colin Walters  <walters at verbum.org>

	* bus/selinux.c (bus_selinux_append_context): Wrap in
	HAVE_SELINUX.


Index: selinux.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/selinux.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- selinux.c	14 Jul 2005 21:45:42 -0000	1.15
+++ selinux.c	15 Jul 2005 04:04:43 -0000	1.16
@@ -571,6 +571,7 @@
 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 @@
 				   DBUS_TYPE_STRING,
 				   SELINUX_SID_FROM_BUS (context),
 				   DBUS_TYPE_INVALID);
+#else
+  return FALSE;
+#endif
 }
 
 /**



More information about the dbus-commit mailing list