From 97af81cffa6891b361521d3fc0b6ea10b478d59d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 17 Jun 2015 22:43:46 +0200 Subject: bus-proxy: add new dbus policy search paths from /usr D-Bus upstream is working on extending the configuration/policy search path, follow this. See #274 for details. --- src/bus-proxyd/proxy.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/bus-proxyd') 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); -- cgit v1.2.3-54-g00ecf