socket: when creating FIFOs, create parent dirs first, and use right access mode

1 files changed, 3 insertions, 1 deletions

diff --git a/socket.c b/socket.c
index afa001f20f..2a19e97b7b 100644
--- a/socket.c
+++ b/socket.c
@@ -267,7 +267,9 @@ static int socket_open_fds(Socket *s) {
                         struct stat st;
                         assert(p->type == SOCKET_FIFO);
 
-                        if (mkfifo(p->path, 0666 & ~s->exec_context.umask) < 0 && errno != EEXIST) {
+                        mkdir_parents(p->path, s->directory_mode);
+
+                        if (mkfifo(p->path, s->socket_mode) < 0 && errno != EEXIST) {
                                 r = -errno;
                                 goto rollback;
                         }