From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 27 Dec 2017 15:50:24 +0000 (+0100)
Subject: socket-label: simplify things a bit by using socket_address_get_path()
X-Git-Tag: v237~139^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=294d46f138e67f9e1bfb18f5ec1b009a4a9d5292;p=platform%2Fupstream%2Fsystemd.git

socket-label: simplify things a bit by using socket_address_get_path()

Let's make this more generic and descriptive, and let's reuse our
existing utility functions.
---

diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 20be406..448265b 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -29,6 +29,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
@@ -51,6 +52,7 @@ int socket_address_listen(
                 const char *label) {
 
         _cleanup_close_ int fd = -1;
+        const char *p;
         int r, one;
 
         assert(a);
@@ -112,16 +114,17 @@ int socket_address_listen(
         if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
                 return -errno;
 
-        if (socket_address_family(a) == AF_UNIX && a->sockaddr.un.sun_path[0] != 0) {
+        p = socket_address_get_path(a);
+        if (p) {
                 /* Create parents */
-                (void) mkdir_parents_label(a->sockaddr.un.sun_path, directory_mode);
+                (void) mkdir_parents_label(p, directory_mode);
 
                 /* Enforce the right access mode for the socket */
                 RUN_WITH_UMASK(~socket_mode) {
                         r = mac_selinux_bind(fd, &a->sockaddr.sa, a->size);
                         if (r == -EADDRINUSE) {
                                 /* Unlink and try again */
-                                unlink(a->sockaddr.un.sun_path);
+                                (void) unlink(p);
                                 if (bind(fd, &a->sockaddr.sa, a->size) < 0)
                                         return -errno;
                         } else if (r < 0)