service: properly handle who argument on D-Bus kill calls
This commit is contained in:
parent
ee17ee7c5c
commit
3611581ebd
|
@ -1777,11 +1777,12 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (who == KILL_CONTROL || who == KILL_ALL)
|
||||||
if (m->control_pid > 0)
|
if (m->control_pid > 0)
|
||||||
if (kill(m->control_pid, signo) < 0)
|
if (kill(m->control_pid, signo) < 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
|
|
||||||
if (mode == KILL_CONTROL_GROUP) {
|
if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {
|
||||||
int q;
|
int q;
|
||||||
|
|
||||||
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
||||||
|
@ -1795,7 +1796,7 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
||||||
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
|
if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
|
||||||
r = q;
|
r = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3270,15 +3270,17 @@ static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusErro
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (who == KILL_CONTROL || who == KILL_ALL)
|
||||||
if (s->control_pid > 0)
|
if (s->control_pid > 0)
|
||||||
if (kill(s->control_pid, signo) < 0)
|
if (kill(s->control_pid, signo) < 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
|
|
||||||
|
if (who == KILL_MAIN || who == KILL_ALL)
|
||||||
if (s->main_pid > 0)
|
if (s->main_pid > 0)
|
||||||
if (kill(s->main_pid, signo) < 0)
|
if (kill(s->main_pid, signo) < 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
|
|
||||||
if (mode == KILL_CONTROL_GROUP) {
|
if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {
|
||||||
int q;
|
int q;
|
||||||
|
|
||||||
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
||||||
|
@ -3298,7 +3300,7 @@ static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusErro
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
||||||
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
|
if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
|
||||||
r = q;
|
r = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2030,11 +2030,12 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (who == KILL_CONTROL || who == KILL_ALL)
|
||||||
if (s->control_pid > 0)
|
if (s->control_pid > 0)
|
||||||
if (kill(s->control_pid, signo) < 0)
|
if (kill(s->control_pid, signo) < 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
|
|
||||||
if (mode == KILL_CONTROL_GROUP) {
|
if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {
|
||||||
int q;
|
int q;
|
||||||
|
|
||||||
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
||||||
|
@ -2048,7 +2049,7 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
||||||
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
|
if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
|
||||||
r = q;
|
r = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1286,11 +1286,12 @@ static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (who == KILL_CONTROL || who == KILL_ALL)
|
||||||
if (s->control_pid > 0)
|
if (s->control_pid > 0)
|
||||||
if (kill(s->control_pid, signo) < 0)
|
if (kill(s->control_pid, signo) < 0)
|
||||||
r = -errno;
|
r = -errno;
|
||||||
|
|
||||||
if (mode == KILL_CONTROL_GROUP) {
|
if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) {
|
||||||
int q;
|
int q;
|
||||||
|
|
||||||
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
|
||||||
|
@ -1304,7 +1305,7 @@ static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
|
||||||
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
|
if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
|
||||||
r = q;
|
r = q;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue