X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=9b54da16cae49d63e0ef7281231f2d435072bb60;hb=f176b5c296ad36119aa2464f9fd738e6da59eeee;hp=848d6a8e4f0d53ad2a9a432d301a95608f210cc7;hpb=4deb3b9391167abfc661dcc43b72c16f6da52861;p=elogind.git

diff --git a/src/systemctl.c b/src/systemctl.c
index 848d6a8e4..9b54da16c 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -4989,8 +4989,17 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
                         return 0;
                 }
 
+                if (!bus) {
+                        log_error("Failed to get D-Bus connection: %s",
+                                  dbus_error_is_set(error) ? error->message : "No connection to service manager.");
+                        return -EIO;
+                }
+
+        } else {
+
                 if (!bus && !avoid_bus()) {
-                        log_error("Failed to get D-Bus connection: %s", error->message);
+                        log_error("Failed to get D-Bus connection: %s",
+                                  dbus_error_is_set(error) ? error->message : "No connection to service manager.");
                         return -EIO;
                 }
         }