From: Thiago Macieira Date: Tue, 29 Mar 2016 19:15:15 +0000 (-0700) Subject: Quote the DBUS_SESSION_BUS_ADDRESS variable in the shell file X-Git-Tag: dbus-1.11.4~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d64d5f996b6146905b665cac9aa02da003ca1346;p=thirdparty%2Fdbus.git Quote the DBUS_SESSION_BUS_ADDRESS variable in the shell file Some D-Bus daemon versions set multiple addresses separated by semi-colon, which breaks sourcing of the file. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=94746 Signed-off-by: Thiago Macieira Reviewed-by: Simon McVittie --- diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c index c7e33309b..a09444bee 100644 --- a/tools/dbus-launch-x11.c +++ b/tools/dbus-launch-x11.c @@ -414,7 +414,7 @@ set_address_in_file (char *address, pid_t pid, Window wid) "# If the DBUS_SESSION_BUS_ADDRESS environment variable is set, it will\n" "# be used rather than this file.\n" "# See \"man dbus-launch\" for more details.\n" - "DBUS_SESSION_BUS_ADDRESS=%s\n" + "DBUS_SESSION_BUS_ADDRESS='%s'\n" "DBUS_SESSION_BUS_PID=%ld\n" "DBUS_SESSION_BUS_WINDOWID=%ld\n", get_machine_uuid (),