diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-08 16:11:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-08 16:11:35 +0000 |
| commit | fccb5a0fe11a2293ba5bfc09e0f3fe296d724eb2 (patch) | |
| tree | be4e98d92272324e8c1c06536b04b6ca56795f16 /bus | |
| parent | 6b01c6cdfdaae6d6847c5f5f8333867f53f0463e (diff) | |
| download | dbus-fccb5a0fe11a2293ba5bfc09e0f3fe296d724eb2.tar.gz | |
Explicitly don't search XDG_DATA_DIRS for system services, and document it
In practice, it never works, because the activation helper doesn't
respect environment variables for security reasons.
If you want to vary the search path, alter system.conf instead, to
replace or augment <standard_system_servicedirs/> with your preferred
search path.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21620
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/config-parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index c636707f..a8953627 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3393,8 +3393,8 @@ test_default_session_servicedirs (void) static const char *test_system_service_dir_matches[] = { #ifdef DBUS_UNIX - "/testusr/testlocal/testshare/dbus-1/system-services", - "/testusr/testshare/dbus-1/system-services", + "/usr/local/share/dbus-1/system-services", + "/usr/share/dbus-1/system-services", #endif DBUS_DATADIR"/dbus-1/system-services", #ifdef DBUS_UNIX |