summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-06-18 00:26:46 +0200
committerKay Sievers <kay@vrfy.org>2015-06-18 00:26:46 +0200
commitbcf1097553f15d17665d036ea6d4803496cc3e26 (patch)
treee634c34a27dd8f17ffb41026d2f692c01f582689 /src
parent5f92d24fa85d6652c4754e3b3b2a3393026bd0b9 (diff)
parent97af81cffa6891b361521d3fc0b6ea10b478d59d (diff)
Merge pull request #276 from poettering/dbus-search-path
bus-proxy: add new dbus policy search paths from /usr
Diffstat (limited to 'src')
-rw-r--r--src/bus-proxyd/proxy.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index aa5010c1ac..28ab1c97fc 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -275,12 +275,16 @@ int proxy_set_policy(Proxy *p, SharedPolicy *sp, char **configuration) {
return log_error_errno(r, "Couldn't determine bus scope: %m");
if (streq(scope, "system"))
- strv = strv_new("/etc/dbus-1/system.conf",
+ strv = strv_new("/usr/share/dbus-1/system.conf",
+ "/etc/dbus-1/system.conf",
+ "/usr/share/dbus-1/system.d/",
"/etc/dbus-1/system.d/",
"/etc/dbus-1/system-local.conf",
NULL);
else if (streq(scope, "user"))
- strv = strv_new("/etc/dbus-1/session.conf",
+ strv = strv_new("/usr/share/dbus-1/session.conf",
+ "/etc/dbus-1/session.conf",
+ "/usr/share/dbus-1/session.d/",
"/etc/dbus-1/session.d/",
"/etc/dbus-1/session-local.conf",
NULL);