manager: move various fields that declare unit defaults into a new structure UnitDefaults

[thirdparty/systemd.git] / src / core / socket.c

diff --git a/src/core/socket.c b/src/core/socket.c
index 88e45c7385fc9eac4fe45b608b75030282f23b30..0603b9337e0d1f2ce5d8b112a6b05a560bde8d4e 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -83,7 +83,7 @@ static void socket_init(Unit *u) {
         assert(u->load_state == UNIT_STUB);
 
         s->backlog = SOMAXCONN_DELUXE;
-        s->timeout_usec = u->manager->default_timeout_start_usec;
+        s->timeout_usec = u->manager->defaults.timeout_start_usec;
         s->directory_mode = 0755;
         s->socket_mode = 0666;
 
@@ -94,8 +94,8 @@ static void socket_init(Unit *u) {
         s->ip_ttl = -1;
         s->mark = -1;
 
-        s->exec_context.std_output = u->manager->default_std_output;
-        s->exec_context.std_error = u->manager->default_std_error;
+        s->exec_context.std_output = u->manager->defaults.std_output;
+        s->exec_context.std_error = u->manager->defaults.std_error;
 
         s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;