From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 28 Aug 2015 16:29:02 +0000 (+0200)
Subject: unit: minor simplification
X-Git-Tag: v226~65^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52f448c3fff64752649af4b8be5260c1a8a105ea;p=thirdparty%2Fsystemd.git

unit: minor simplification
---

diff --git a/src/core/unit.c b/src/core/unit.c
index 9afb5736d7a..5f602bdf5f8 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3135,17 +3135,17 @@ int unit_kill_common(
 
         int r = 0;
 
-        if (who == KILL_MAIN && main_pid <= 0) {
+        if (who == KILL_MAIN) {
                 if (main_pid < 0)
                         return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no main processes", unit_type_to_string(u->type));
-                else
+                else if (main_pid == 0)
                         return sd_bus_error_set_const(error, BUS_ERROR_NO_SUCH_PROCESS, "No main process to kill");
         }
 
-        if (who == KILL_CONTROL && control_pid <= 0) {
+        if (who == KILL_CONTROL) {
                 if (control_pid < 0)
                         return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no control processes", unit_type_to_string(u->type));
-                else
+                else if (control_pid == 0)
                         return sd_bus_error_set_const(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
         }