util: add a bit of syntactic sugar to run short code fragments with a different umask

[elogind.git] / src / shared / ask-password-api.c

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 005f40fef7caea2cc98e1ac6f684b5d194f8b83f..277efd302ef60e3478f5a25c54e8fd9d98189ddc 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -251,11 +251,11 @@ static int create_socket(char **name) {
         } sa;
         int one = 1, r;
         char *c;
-        mode_t u;
 
         assert(name);
 
-        if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0)) < 0) {
+        fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+        if (fd < 0) {
                 log_error("socket() failed: %m");
                 return -errno;
         }
@@ -264,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;
@@ -280,9 +280,9 @@ static int create_socket(char **name) {
                 goto fail;
         }
 
-        if (!(c = strdup(sa.un.sun_path))) {
-                r = -ENOMEM;
-                log_error("Out of memory.");
+        c = strdup(sa.un.sun_path);
+        if (!c) {
+                r = log_oom();
                 goto fail;
         }
 
@@ -316,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);
 
@@ -326,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");