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 41c7db9ee5cc7a2961e8debf51433e174eb40130..e16b3b8d2632521494913150922e454789eda5e4 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-04-27  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-sysdeps-unix.c (_dbus_open_socket): fix #10781 from

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 962a19820b84c7819f525e305f4a15cde1991f62..d85184184addbaaa44e2a6148f9b0cf606a87eee 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>