From: Havoc Pennington <hp@redhat.com>
Date: Wed, 23 May 2007 19:45:56 +0000 (+0000)
Subject: 2007-05-23  Havoc Pennington  <hp@redhat.com>
X-Git-Tag: dbus-1.1.0~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae68ad2ab922b5837542d150e94bbbdb0d26da90;p=thirdparty%2Fdbus.git

2007-05-23  Havoc Pennington  <hp@redhat.com>

	* bus/Makefile.am (install-data-hook): create session.d

	* bus/session.conf.in: add session.d for the session bus, so
	security policy can be extended
---

diff --git a/ChangeLog b/ChangeLog
index d55bdb55b..965a7bb23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-23  Havoc Pennington  <hp@redhat.com>
+
+	* bus/Makefile.am (install-data-hook): create session.d
+
+	* bus/session.conf.in: add session.d for the session bus, so
+	security policy can be extended
+
 2007-05-22 Ralf.Habacker <ralf.habacker@freenet.de>
 
 	* cmake/CMakeLists.txt: fixed creating of TEST_..._BINARY to make 
diff --git a/bus/Makefile.am b/bus/Makefile.am
index 391ea5099..0ba5f3413 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -113,6 +113,7 @@ install-data-hook:
 	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
 
 #### Init scripts fun
diff --git a/bus/session.conf.in b/bus/session.conf.in
index 58c6ba1cc..b2dee5b36 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -21,6 +21,10 @@
     <allow own="*"/>
   </policy>
 
+  <!-- Config files are placed here that among other things, 
+       further restrict the above policy for specific services. -->
+  <includedir>session.d</includedir>
+
   <!-- This is included last so local configuration can override what's 
        in this standard file -->
   <include ignore_missing="yes">session-local.conf</include>