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 d55bdb55bfb94f4d36749a199788a4c68be42915..965a7bb233ea91c621c9b850130a9f8b9e8021a5 100644 (file)
--- 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 391ea509980465d07661e71e236a01f4cc594e5b..0ba5f34139da9f9f26e738f899cb9cff61d5994d 100644 (file)
--- 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 58c6ba1cc4637b0d9be34d93d987e19385783113..b2dee5b36fda7da01992617ac5c9fe9383b80451 100644 (file)
--- 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>