diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-03-24 14:30:16 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-03-27 14:47:30 +0200 |
| commit | 1522077269c7df21b7f9b85e4749b9e32ccd0139 (patch) | |
| tree | 102660e538427c5269615922a9529083b9fecd1b /src/core/socket.c | |
| parent | 28135da3cdca53157bd878ae00b15d6e33ca4987 (diff) | |
| download | systemd-1522077269c7df21b7f9b85e4749b9e32ccd0139.tar.gz | |
core: Move DynamicCreds into ExecRuntime
This is just another piece of runtime data so let's store it in
ExecRuntime alongside the other runtime data.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 163fc0bebf..af6603df07 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -154,8 +154,6 @@ static void socket_done(Unit *u) { exec_command_free_array(s->exec_command, _SOCKET_EXEC_COMMAND_MAX); s->control_command = NULL; - dynamic_creds_unref(&s->dynamic_creds); - socket_unwatch_control_pid(s); unit_ref_unset(&s->service); @@ -1908,10 +1906,8 @@ static int socket_coldplug(Unit *u) { return r; } - if (!IN_SET(s->deserialized_state, SOCKET_DEAD, SOCKET_FAILED, SOCKET_CLEANING)) { - (void) unit_setup_dynamic_creds(u); + if (!IN_SET(s->deserialized_state, SOCKET_DEAD, SOCKET_FAILED, SOCKET_CLEANING)) (void) unit_setup_exec_runtime(u); - } socket_set_state(s, s->deserialized_state); return 0; @@ -1950,7 +1946,6 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) { &s->exec_context, &exec_params, s->exec_runtime, - &s->dynamic_creds, &s->cgroup_context, &pid); if (r < 0) @@ -2057,8 +2052,6 @@ static void socket_enter_dead(Socket *s, SocketResult f) { unit_destroy_runtime_data(UNIT(s), &s->exec_context); unit_unref_uid_gid(UNIT(s), true); - - dynamic_creds_destroy(&s->dynamic_creds); } static void socket_enter_signal(Socket *s, SocketState state, SocketResult f); @@ -3471,7 +3464,6 @@ const UnitVTable socket_vtable = { .cgroup_context_offset = offsetof(Socket, cgroup_context), .kill_context_offset = offsetof(Socket, kill_context), .exec_runtime_offset = offsetof(Socket, exec_runtime), - .dynamic_creds_offset = offsetof(Socket, dynamic_creds), .sections = "Unit\0" |