summaryrefslogtreecommitdiff
path: root/bus/system.conf.in
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-04-28 19:29:42 +0000
committerHavoc Pennington <hp@redhat.com>2003-04-28 19:29:42 +0000
commit893d859ed4ab785f46485fad28779f026fa166a1 (patch)
tree7e4791276313367c96ad042d711da409a22e902b /bus/system.conf.in
parente8d396efef695b9868b0112c4a6266c97678fa8a (diff)
2003-04-28 Havoc Pennington <hp@redhat.com>dbus-0.10
* configure.in: 0.10 * NEWS: update * bus/system.conf.in: add <includedir>system.d</includedir> * dbus/dbus-userdb.c (_dbus_user_database_lookup): fix bug when username was provided but not uid * bus/config-parser.c (struct BusConfigParser): keep track of whether the parser is toplevel or was included; change some of the error handling if it's included.
Diffstat (limited to 'bus/system.conf.in')
-rw-r--r--bus/system.conf.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/bus/system.conf.in b/bus/system.conf.in
index e65c4af1..d8cd96a8 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -38,7 +38,12 @@
<allow user="*"/>
</policy>
+ <!-- Config files are placed here that among other things, punch
+ holes in the above policy for specific services. -->
+ <includedir>system.d</includedir>
+
<!-- This is included last so local configuration can override what's
in this standard file -->
<include ignore_missing="yes">system-local.conf</include>
+
</busconfig>