From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 1 Sep 2010 00:11:52 +0000 (+0200)
Subject: systemctl: make sure daemon-reexec and friends return a correct error code
X-Git-Tag: v9~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=aabd9b11ba563e1d988b119960c94b139ec5de00;hp=706900b704eac4eb26e3e30795c2ead8b0c3e673

systemctl: make sure daemon-reexec and friends return a correct error code
---

diff --git a/src/systemctl.c b/src/systemctl.c
index 901804a76..ea09c3cf3 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -2928,7 +2928,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) {
                 if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(&error)) {
                         /* There's always a fallback possible for
                          * legacy actions. */
-                        r = 0;
+                        r = -EADDRNOTAVAIL;
                         goto finish;
                 }
 
@@ -2937,7 +2937,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) {
                 goto finish;
         }
 
-        r = 1;
+        r = 0;
 
 finish:
         if (m)
@@ -4605,7 +4605,7 @@ static int talk_upstart(void) {
         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
 
                 if (error_is_no_service(&error)) {
-                        r = 0;
+                        r = -EADDRNOTAVAIL;
                         goto finish;
                 }
 
@@ -4614,7 +4614,7 @@ static int talk_upstart(void) {
                 goto finish;
         }
 
-        r = 1;
+        r = 0;
 
 finish:
         if (m)