diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-17 22:43:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-17 22:43:46 +0200 |
| commit | 97af81cffa6891b361521d3fc0b6ea10b478d59d (patch) | |
| tree | 7028b43968e41f559dc84222a31862e26b4b7499 /src/bus-proxyd/proxy.c | |
| parent | Merge pull request #248 from llua/zsh-completion (diff) | |
| download | systemd-97af81cffa6891b361521d3fc0b6ea10b478d59d.tar.xz systemd-97af81cffa6891b361521d3fc0b6ea10b478d59d.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | src/bus-proxyd/proxy.c | 8 |
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); |