macro: add macro for precisely determining length of decimal string formatting of...

[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 55be807cf20eb634b44b6939288d2febaef7e6d7..85530660dcdeeb949ad5e5bb87846497a8b7c57e 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -255,7 +255,8 @@ static int create_socket(char **name) {
 
         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;
         }
@@ -280,9 +281,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;
         }
 
@@ -324,7 +325,7 @@ int ask_password_agent(
         sigset_add_many(&mask, SIGINT, SIGTERM, -1);
         assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0);
 
-        mkdir_p("/run/systemd/ask-password", 0755);
+        mkdir_p_label("/run/systemd/ask-password", 0755);
 
         u = umask(0022);
         fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);