From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Nov 2014 20:01:06 +0000 (+0100)
Subject: busctl: when --address is specified do not assume we connect to a full bus
X-Git-Tag: v218~406
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b18ec7e29f9756bb66f63a0fa02a6ceb40b38b03;hp=79f34de9fb8e4faa6ed0847b386099a4ba100a8a;p=elogind.git

busctl: when --address is specified do not assume we connect to a full bus
---

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index 4da807437..809940a2d 100644
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -1612,6 +1612,12 @@ int main(int argc, char *argv[]) {
         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("Failed to set bus client: %s", strerror(-r));
+                        goto finish;
+                }
+
                 switch (arg_transport) {
 
                 case BUS_TRANSPORT_LOCAL:
@@ -1638,12 +1644,6 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = sd_bus_set_bus_client(bus, true);
-        if (r < 0) {
-                log_error("Failed to set bus client: %s", strerror(-r));
-                goto finish;
-        }
-
         r = sd_bus_start(bus);
         if (r < 0) {
                 log_error("Failed to connect to bus: %s", strerror(-r));