a52f674
From 07138cd2967a6a56ca8b17267d054758ff53fd4c Mon Sep 17 00:00:00 2001
b12ff75
From: Marius Vollmer <mvollmer@redhat.com>
b12ff75
Date: Thu, 31 Oct 2013 15:55:07 +0200
b12ff75
Subject: [PATCH] logind: use correct "who" enum values with KillUnit.
b12ff75
a52f674
NB This is already fixed differently in systemd 209 with the port to kdbus
b12ff75
---
b12ff75
 src/login/logind-dbus.c | 4 ++--
b12ff75
 1 file changed, 2 insertions(+), 2 deletions(-)
b12ff75
b12ff75
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
b12ff75
index bb85c7d..583d62e 100644
b12ff75
--- a/src/login/logind-dbus.c
b12ff75
+++ b/src/login/logind-dbus.c
b12ff75
@@ -2799,7 +2799,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
b12ff75
         assert(manager);
b12ff75
         assert(unit);
b12ff75
 
b12ff75
-        w = who == KILL_LEADER ? "process" : "cgroup";
b12ff75
+        w = who == KILL_LEADER ? "control" : "all";
b12ff75
         assert_cc(sizeof(signo) == sizeof(int32_t));
b12ff75
 
b12ff75
         r = bus_method_call_with_reply(
b12ff75
@@ -2815,7 +2815,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
b12ff75
                         DBUS_TYPE_INT32, &signo,
b12ff75
                         DBUS_TYPE_INVALID);
b12ff75
         if (r < 0) {
b12ff75
-                log_error("Failed to stop unit %s: %s", unit, bus_error(error, r));
b12ff75
+                log_error("Failed to kill unit %s: %s", unit, bus_error(error, r));
b12ff75
                 return r;
b12ff75
         }
b12ff75