summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2007-05-23 19:45:56 +0000
committerHavoc Pennington <hp@redhat.com>2007-05-23 19:45:56 +0000
commita579e3b0453dec7b87f15b0021b6ef9d819a12bf (patch)
tree19c166694b51df630b422b4c6dec27a8ffad1b72
parent6330489bbf1263d91dbed482f038efd1ce30ebf6 (diff)
downloaddbus-a579e3b0453dec7b87f15b0021b6ef9d819a12bf.tar.gz
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
-rw-r--r--ChangeLog7
-rw-r--r--bus/Makefile.am1
-rw-r--r--bus/session.conf.in4
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 41c7db9e..e16b3b8d 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-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 391ea509..0ba5f341 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 962a1982..d8518418 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>