picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #276 from poettering/dbus-search-path

Browse source 
bus-proxy: add new dbus policy search paths from /usr
This commit is contained in:
Kay Sievers 2015-06-18 00:26:46 +02:00
parent 5f92d24fa8 97af81cffa
commit bcf1097553
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bus-proxyd/proxy.c
View file

@ -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);