tree-wide: use sockaddr_un_unlink() whereever appropriate

Let's port everything over.
This commit is contained in:
Lennart Poettering 2018-10-15 12:08:30 +02:00
parent 9f20fc28f0
commit 155b687669
7 changed files with 8 additions and 8 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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;

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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;
}