From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Oct 2018 17:40:18 +0000 (+0200)
Subject: tree-wide: use sockaddr_un_unlink() at two more places where appropriate
X-Git-Tag: v240~538^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbda85b07826c8edc8fc3f2ecfa8e4ce3ef10f7b;p=platform%2Fupstream%2Fsystemd.git

tree-wide: use sockaddr_un_unlink() at two more places where appropriate
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 43180ad..7b6a841 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -894,7 +894,7 @@ static int manager_setup_notify(Manager *m) {
                         return log_error_errno(salen, "Notify socket '%s' not valid for AF_UNIX socket address, refusing.", m->notify_socket);
 
                 (void) mkdir_parents_label(m->notify_socket, 0755);
-                (void) unlink(m->notify_socket);
+                (void) sockaddr_un_unlink(&sa.un);
 
                 r = bind(fd, &sa.sa, salen);
                 if (r < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 49b8ba4..a6802d6 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2824,7 +2824,7 @@ static int setup_sd_notify_child(void) {
                 return log_error_errno(errno, "Failed to allocate notification socket: %m");
 
         (void) mkdir_parents(NSPAWN_NOTIFY_SOCKET_PATH, 0755);
-        (void) unlink(NSPAWN_NOTIFY_SOCKET_PATH);
+        (void) sockaddr_un_unlink(&sa.un);
 
         r = bind(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
         if (r < 0) {