|
 |
84b277 |
From 53e9be6b9c38a7a7d943b01da6898355c535991e Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Marius Vollmer <mvollmer@redhat.com>
|
|
|
84b277 |
Date: Thu, 31 Oct 2013 15:55:07 +0200
|
|
|
84b277 |
Subject: [PATCH] logind: use correct "who" enum values with KillUnit.
|
|
|
84b277 |
|
|
|
84b277 |
rhel-only (in upstream fixed during dbus rewrite)
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #1155502
|
|
|
84b277 |
---
|
|
|
84b277 |
src/login/logind-dbus.c | 6 +++---
|
|
|
84b277 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
|
|
84b277 |
index 6cabb7b..4137522 100644
|
|
|
84b277 |
--- a/src/login/logind-dbus.c
|
|
|
84b277 |
+++ b/src/login/logind-dbus.c
|
|
|
84b277 |
@@ -116,7 +116,7 @@
|
|
|
84b277 |
" <method name=\"KillSession\">\n" \
|
|
|
84b277 |
" <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
|
|
|
84b277 |
" <arg name=\"who\" type=\"s\" direction=\"in\"/>\n" \
|
|
|
84b277 |
- " <arg name=\"signal\" type=\"s\" direction=\"in\"/>\n" \
|
|
|
84b277 |
+ " <arg name=\"signal\" type=\"i\" direction=\"in\"/>\n" \
|
|
|
84b277 |
" </method>\n" \
|
|
|
84b277 |
" <method name=\"KillUser\">\n" \
|
|
|
84b277 |
" <arg name=\"uid\" type=\"u\" direction=\"in\"/>\n" \
|
|
|
84b277 |
@@ -2814,7 +2814,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
|
|
84b277 |
assert(manager);
|
|
|
84b277 |
assert(unit);
|
|
|
84b277 |
|
|
|
84b277 |
- w = who == KILL_LEADER ? "process" : "cgroup";
|
|
|
84b277 |
+ w = who == KILL_LEADER ? "main" : "all";
|
|
|
84b277 |
assert_cc(sizeof(signo) == sizeof(int32_t));
|
|
|
84b277 |
|
|
|
84b277 |
r = bus_method_call_with_reply(
|
|
|
84b277 |
@@ -2830,7 +2830,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
|
|
84b277 |
DBUS_TYPE_INT32, &signo,
|
|
|
84b277 |
DBUS_TYPE_INVALID);
|
|
|
84b277 |
if (r < 0) {
|
|
|
84b277 |
- log_error("Failed to stop unit %s: %s", unit, bus_error(error, r));
|
|
|
84b277 |
+ log_error("Failed to kill unit %s: %s", unit, bus_error(error, r));
|
|
|
84b277 |
return r;
|
|
|
84b277 |
}
|
|
|
84b277 |
|