diff options
Diffstat (limited to 'src/shared/ask-password-api.c')
| -rw-r--r-- | src/shared/ask-password-api.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 85530660dc..277efd302e 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -251,7 +251,6 @@ static int create_socket(char **name) { } sa; int one = 1, r; char *c; - mode_t u; assert(name); @@ -265,9 +264,9 @@ static int create_socket(char **name) { sa.un.sun_family = AF_UNIX; snprintf(sa.un.sun_path, sizeof(sa.un.sun_path)-1, "/run/systemd/ask-password/sck.%llu", random_ull()); - u = umask(0177); - r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); - umask(u); + RUN_WITH_UMASK(0177) { + r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); + } if (r < 0) { r = -errno; @@ -317,7 +316,6 @@ int ask_password_agent( int socket_fd = -1, signal_fd = -1; sigset_t mask, oldmask; struct pollfd pollfd[_FD_MAX]; - mode_t u; assert(_passphrases); @@ -327,9 +325,9 @@ int ask_password_agent( mkdir_p_label("/run/systemd/ask-password", 0755); - u = umask(0022); - fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY); - umask(u); + RUN_WITH_UMASK(0022) { + fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY); + } if (fd < 0) { log_error("Failed to create password file: %m"); |