clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-28 09:00:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: unify how we create the notify and private dbus socket

Browse Source 
Use the same robust logic of mkdir + unlink of any existing AF_UNIX
socket, ignoring the return value, right before bind().
This commit is contained in:
Lennart Poettering
2014-11-07 16:36:14 +01:00
parent d48b7bd271
commit f0e62e8997
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus.c
+2 -3
View File
@@ -974,11 +974,10 @@ static int bus_init_private(Manager *m) {
left = strpcpy(&p, left, "/systemd/private");
salen = sizeof(sa.un) - left;
mkdir_parents_label(sa.un.sun_path, 0755);
}
unlink(sa.un.sun_path);
(void) mkdir_parents_label(sa.un.sun_path, 0755);
(void) unlink(sa.un.sun_path);
fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (fd < 0) {
src/core/manager.c
+2 -15
View File
@@ -679,26 +679,13 @@ static int manager_setup_notify(Manager *m) {
return log_oom();
(void) mkdir_parents_label(m->notify_socket, 0755);
(void) unlink(m->notify_socket);
strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1);
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind(%s) failed: %m", sa.un.sun_path);
if (errno == EADDRINUSE) {
log_notice("Removing %s socket and trying again.", m->notify_socket);
r = unlink(m->notify_socket);
if (r < 0) {
log_error("Failed to remove %s: %m", m->notify_socket);
return -EADDRINUSE;
}
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind(%s) failed: %m", sa.un.sun_path);
return -errno;
}
} else
return -errno;
return -errno;
}
r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));