From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Oct 2018 10:08:30 +0000 (+0200)
Subject: tree-wide: use sockaddr_un_unlink() whereever appropriate
X-Git-Tag: v240~538^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=155b6876699bcca455b50f52c541aed41c2bf8d3;p=thirdparty%2Fsystemd.git

tree-wide: use sockaddr_un_unlink() whereever appropriate

Let's port everything over.
---

diff --git a/src/core/dbus.c b/src/core/dbus.c
index bf5917696e0..4b04498423a 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1012,7 +1012,7 @@ int bus_init_private(Manager *m) {
         }
 
         (void) mkdir_parents_label(sa.un.sun_path, 0755);
-        (void) unlink(sa.un.sun_path);
+        (void) sockaddr_un_unlink(&sa.un);
 
         fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
         if (fd < 0)
diff --git a/src/core/manager.c b/src/core/manager.c
index 971faef90a7..e8ade8b7f7c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -970,7 +970,7 @@ static int manager_setup_cgroups_agent(Manager *m) {
 
                 fd_inc_rcvbuf(fd, CGROUPS_AGENT_RCVBUF_SIZE);
 
-                (void) unlink(sa.un.sun_path);
+                (void) sockaddr_un_unlink(&sa.un);
 
                 /* Only allow root to connect to this socket */
                 RUN_WITH_UMASK(0077)
diff --git a/src/import/importd.c b/src/import/importd.c
index 04563fb0981..c42b3914aa5 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -608,7 +608,7 @@ static int manager_new(Manager **ret) {
                 return -errno;
 
         (void) mkdir_parents_label(sa.un.sun_path, 0755);
-        (void) unlink(sa.un.sun_path);
+        (void) sockaddr_un_unlink(&sa.un);
 
         if (bind(m->notify_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0)
                 return -errno;
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 44610a4b3b3..bf1ef64e706 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -453,7 +453,7 @@ int server_open_native_socket(Server*s) {
                 if (s->native_fd < 0)
                         return log_error_errno(errno, "socket() failed: %m");
 
-                (void) unlink(sa.un.sun_path);
+                (void) sockaddr_un_unlink(&sa.un);
 
                 r = bind(s->native_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
                 if (r < 0)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 267e63f4a25..502bd6f51bb 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -793,7 +793,7 @@ int server_open_stdout_socket(Server *s) {
                 if (s->stdout_fd < 0)
                         return log_error_errno(errno, "socket() failed: %m");
 
-                (void) unlink(sa.un.sun_path);
+                (void) sockaddr_un_unlink(&sa.un);
 
                 r = bind(s->stdout_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
                 if (r < 0)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 46cc110f1cc..5bf057f4ce2 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -457,7 +457,7 @@ int server_open_syslog_socket(Server *s) {
                 if (s->syslog_fd < 0)
                         return log_error_errno(errno, "socket() failed: %m");
 
-                (void) unlink(sa.un.sun_path);
+                (void) sockaddr_un_unlink(&sa.un);
 
                 r = bind(s->syslog_fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
                 if (r < 0)
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 64024100fe8..df9ceef7ce6 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -117,7 +117,7 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) {
         if (!uctrl->bound) {
                 err = bind(uctrl->sock, &uctrl->saddr.sa, uctrl->addrlen);
                 if (err < 0 && errno == EADDRINUSE) {
-                        unlink(uctrl->saddr.un.sun_path);
+                        (void) sockaddr_un_unlink(&uctrl->saddr.un);
                         err = bind(uctrl->sock, &uctrl->saddr.sa, uctrl->addrlen);
                 }
 
@@ -148,7 +148,7 @@ int udev_ctrl_cleanup(struct udev_ctrl *uctrl) {
         if (uctrl == NULL)
                 return 0;
         if (uctrl->cleanup_socket)
-                unlink(uctrl->saddr.un.sun_path);
+                sockaddr_un_unlink(&uctrl->saddr.un);
         return 0;
 }