From e40d11d4079d1d351d0aa3b20c196760d1f1c505 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 22 Sep 2011 18:35:47 +0200
Subject: [PATCH 5/5] include selinux stuff in session.conf only when configured with

---
 bus/Makefile.am          |    5 +++++
 bus/session.conf.in      |    2 +-
 cmake/bus/CMakeLists.txt |   11 ++++++-----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 4f6a803..dcb09bc 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -8,6 +8,11 @@ INCLUDES = -I$(top_srcdir) \
 
 EFENCE=
 
+if DBUS_HAVE_SELINUX
+DBUS_CONF_INCLUDE_SELINUX =
+    <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+endif
+
 CONFIG_IN_FILES=				\
 	session.conf.in				\
 	system.conf.in				\
diff --git a/bus/session.conf.in b/bus/session.conf.in
index e121ff9..87fc5e3 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -33,7 +33,7 @@
        in this standard file -->
   <include ignore_missing="yes">session-local.conf</include>
 
-  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+  @DBUS_CONF_INCLUDE_SELINUX@
 
   <!-- For the session bus, override the default relatively-low limits 
        with essentially infinite limits, since the bus is just running 
diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
index 2ecbd58..dd3fb2a 100644
--- a/cmake/bus/CMakeLists.txt
+++ b/cmake/bus/CMakeLists.txt
@@ -4,19 +4,20 @@ add_definitions(-DDBUS_COMPILATION)
 
 SET(EFENCE "")
 SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus)
-if (DBUS_ENABLE_SELINUX)
-    set (DBUS_CONF_INCLUDE_SELINUX "<include if_selinux_enabled=\"yes\" selinux_root_relative=\"yes\">contexts/dbus_contexts</include>\n\n")
-endif (DBUS_ENABLE_SELINUX)
-
 
 set (config_DATA
 	session.conf				
 	system.conf
 )
 
+if (DBUS_ENABLE_SELINUX)
+    configure_file("${BUS_DIR}/selinux.conf.in" FILES "${CMAKE_CURRENT_BINARY_DIR}/session.d/selinux.conf" IMMEDIATE @ONLY)
+    install_files(/etc/dbus-1/session.d FILES "${CMAKE_CURRENT_BINARY_DIR}/session.d/selinux.conf")
+endif ()
+
 # config files for installation 
 FOREACH(file ${config_DATA})
-	CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/${file}.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${file}" IMMEDIATE @ONLY)
+	CONFIGURE_FILE( "${BUS_DIR}/${file}.in" "${CMAKE_CURRENT_BINARY_DIR}/${file}" IMMEDIATE @ONLY)
 ENDFOREACH(file)
 
 # copy services for local daemon start to local service dir data/dbus-1/services
-- 
1.7.4.msysgit.0