From: David Herrmann <dh.herrmann@gmail.com>
Date: Fri, 31 Jul 2015 17:58:19 +0000 (+0200)
Subject: busctl: make sure --address connects as bus-client
X-Git-Tag: v225~132^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d87d4a989e05e69ed80c0aca38fdbc6f4959cf3;p=thirdparty%2Fsystemd.git

busctl: make sure --address connects as bus-client

There is really no reason to use `busctl` to connect to legacy private
bus endpoints. Fix this and make sure `busctl --address=unix:path=/foo`
works!
---

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 6aaaf0e5ec4..017a0d8f170 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -2018,15 +2018,15 @@ int main(int argc, char *argv[]) {
                 }
         }
 
+        r = sd_bus_set_bus_client(bus, true);
+        if (r < 0) {
+                log_error_errno(r, "Failed to set bus client: %m");
+                goto finish;
+        }
+
         if (arg_address)
                 r = sd_bus_set_address(bus, arg_address);
         else {
-                r = sd_bus_set_bus_client(bus, true);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to set bus client: %m");
-                        goto finish;
-                }
-
                 switch (arg_transport) {
 
                 case BUS_TRANSPORT_LOCAL: