X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/9e0161ce6242483f0400c561014ea8bf12df6d45..a9279e37b649abd11bbc416398cfaf787cd8d865:/server/admin.c diff --git a/server/admin.c b/server/admin.c index 32b35772..8eb5ec3c 100644 --- a/server/admin.c +++ b/server/admin.c @@ -2213,13 +2213,14 @@ void a_daemon(void) { flags |= F_DAEMON; } * Arguments: @const char *name@ = socket name to create * @uid_t u@ = user to own the socket * @gid_t g@ = group to own the socket + * @mode_t m@ = permissions to set on the socket * * Returns: --- * * Use: Creates the admin listening socket. */ -void a_init(const char *name, uid_t u, gid_t g) +void a_init(const char *name, uid_t u, gid_t g, mode_t m) { int fd; int n = 5; @@ -2275,14 +2276,14 @@ again: close(fd); goto again; } - if (chmod(sun.sun_path, 0600)) { - die(EXIT_FAILURE, "failed to set socket permissions: %s", - strerror(errno)); - } if (chown(sun.sun_path, u, g)) { die(EXIT_FAILURE, "failed to set socket owner: %s", strerror(errno)); } + if (chmod(sun.sun_path, m)) { + die(EXIT_FAILURE, "failed to set socket permissions: %s", + strerror(errno)); + } umask(omask); fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC); if (listen(fd, 5))