chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: hook up more tests with make check
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index df47578a49a1f65dd041371988b567ce7ea6d02d..3613e8420e2312928a7e47ea6ae99af6a6a49aa0 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-761,7
+761,7
@@
static int fifo_address_create(
assert(path);
assert(_fd);
assert(path);
assert(_fd);
- mkdir_parents(path, directory_mode);
+ mkdir_parents
_label
(path, directory_mode);
r = label_context_set(path, S_IFIFO);
if (r < 0)
r = label_context_set(path, S_IFIFO);
if (r < 0)
@@
-1153,6
+1153,7
@@
static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
UNIT(s)->cgroup_bondings,
UNIT(s)->cgroup_attributes,
NULL,
UNIT(s)->cgroup_bondings,
UNIT(s)->cgroup_attributes,
NULL,
+ UNIT(s)->id,
NULL,
&pid);
NULL,
&pid);
@@
-2184,7
+2185,6
@@
static const char* const socket_result_table[_SOCKET_RESULT_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
const UnitVTable socket_vtable = {
DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
const UnitVTable socket_vtable = {
- .suffix = ".socket",
.object_size = sizeof(Socket),
.sections =
"Unit\0"
.object_size = sizeof(Socket),
.sections =
"Unit\0"