chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: export unit file state
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index 8b78a3fd25a0644d961feef1284fcb212370ec56..44051554818d07af0d2c6939c31029237cbd6c23 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-892,11
+892,14
@@
static int socket_open_fds(Socket *s) {
if ((r = socket_instantiate_service(s)) < 0)
return r;
if ((r = socket_instantiate_service(s)) < 0)
return r;
- if (s->service && s->service->exec_command[SERVICE_EXEC_START])
- if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0) {
+ if (s->service && s->service->exec_command[SERVICE_EXEC_START]) {
+ r = label_get_create_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label);
+
+ if (r < 0) {
if (r != -EPERM)
return r;
}
if (r != -EPERM)
return r;
}
+ }
know_label = true;
}
know_label = true;
}
@@
-2022,19
+2025,20
@@
static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Socket units have no main processes");
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Socket units have no main processes");
- return -E
INVAL
;
+ return -E
SRCH
;
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
- return -E
NOENT
;
+ return -E
SRCH
;
}
}
- if (s->control_pid > 0)
- if (kill(s->control_pid, signo) < 0)
- r = -errno;
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (s->control_pid > 0)
+ if (kill(s->control_pid, signo) < 0)
+ r = -errno;
- if (mode == KILL_CONTROL_GROUP) {
+ if (
who == KILL_ALL &&
mode == KILL_CONTROL_GROUP) {
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
@@
-2048,7
+2052,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;
}