From: Kay Sievers <kay@vrfy.org>
Date: Sun, 1 Dec 2013 17:17:21 +0000 (+0100)
Subject: bus: bus_open_user_systemd() fall back to bus if runtime dir is not set
X-Git-Tag: v209~1165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=537220d9102a12aa4a65d5479130ac2cdb323fff;p=thirdparty%2Fsystemd.git

bus: bus_open_user_systemd() fall back to bus if runtime dir is not set
---

diff --git a/src/libsystemd-bus/bus-util.c b/src/libsystemd-bus/bus-util.c
index 5069aaaaba8..bd005262ebc 100644
--- a/src/libsystemd-bus/bus-util.c
+++ b/src/libsystemd-bus/bus-util.c
@@ -477,10 +477,11 @@ int bus_open_user_systemd(sd_bus **_bus) {
         assert(_bus);
 
         e = secure_getenv("XDG_RUNTIME_DIR");
-        if (e) {
-                if (asprintf(&p, "unix:path=%s/systemd/private", e) < 0)
-                        return -ENOMEM;
-        }
+        if (!e)
+                return sd_bus_open_user(_bus);
+
+        if (asprintf(&p, "unix:path=%s/systemd/private", e) < 0)
+                return -ENOMEM;
 
         r = sd_bus_new(&bus);
         if (r < 0)