X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsocket.c;h=cbbfb0cd3a033436a7215ec36fa72300a78ffa01;hp=19b463e6a452553c6cc922f79764ab796bd5202f;hb=96342de68d0d6de71a062d984dafd2a0905ed9fe;hpb=c74f17d96cccd4cc998fd037cb92046930188c91

diff --git a/src/core/socket.c b/src/core/socket.c
index 19b463e6a..cbbfb0cd3 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -374,7 +374,7 @@ static int socket_load(Unit *u) {
                         if ((r = socket_add_default_dependencies(s)) < 0)
                                 return r;
 
-                r = unit_patch_working_directory(UNIT(s), &s->exec_context);
+                r = unit_exec_context_defaults(u, &s->exec_context);
                 if (r < 0)
                         return r;
         }
@@ -1884,7 +1884,7 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         s->control_pid = 0;
 
-        if (is_clean_exit(code, status))
+        if (is_clean_exit(code, status, NULL))
                 f = SOCKET_SUCCESS;
         else if (code == CLD_EXITED)
                 f = SOCKET_FAILURE_EXIT_CODE;