chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: reuse the same /tmp, /var/tmp and inaccessible dir
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index ee9de4e14c38f8f28e781d44c4a57664aa71ca55..a3e3631daca2aa195e4e1d08bbaad94557fc8007 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-127,7
+127,7
@@
static void socket_done(Unit *u) {
socket_free_ports(s);
socket_free_ports(s);
- exec_context_done(&s->exec_context);
+ exec_context_done(&s->exec_context
, manager_is_reloading_or_reexecuting(u->manager)
);
exec_command_free_array(s->exec_command, _SOCKET_EXEC_COMMAND_MAX);
s->control_command = NULL;
exec_command_free_array(s->exec_command, _SOCKET_EXEC_COMMAND_MAX);
s->control_command = NULL;
@@
-1253,6
+1253,7
@@
static void socket_enter_dead(Socket *s, SocketResult f) {
if (f != SOCKET_SUCCESS)
s->result = f;
if (f != SOCKET_SUCCESS)
s->result = f;
+ exec_context_tmp_dirs_done(&s->exec_context);
socket_set_state(s, s->result != SOCKET_SUCCESS ? SOCKET_FAILED : SOCKET_DEAD);
}
socket_set_state(s, s->result != SOCKET_SUCCESS ? SOCKET_FAILED : SOCKET_DEAD);
}
@@
-1742,6
+1743,8
@@
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
}
}
}
}
+ exec_context_serialize(&s->exec_context, UNIT(s), f);
+
return 0;
}
return 0;
}
@@
-1901,7
+1904,22
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
p->fd = fdset_remove(fds, fd);
}
}
p->fd = fdset_remove(fds, fd);
}
}
+ } else if (streq(key, "tmp-dir")) {
+ char *t;
+
+ t = strdup(value);
+ if (!t)
+ return log_oom();
+
+ s->exec_context.tmp_dir = t;
+ } else if (streq(key, "var-tmp-dir")) {
+ char *t;
+
+ t = strdup(value);
+ if (!t)
+ return log_oom();
+ s->exec_context.var_tmp_dir = t;
} else
log_debug_unit(UNIT(s)->id,
"Unknown serialization key '%s'", key);
} else
log_debug_unit(UNIT(s)->id,
"Unknown serialization key '%s'", key);