clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-18 22:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd: try harder to bind to notify socket

Browse Source 
Without the socket open we are going to crash and burn. If for
whatever reason we fail during deserialization we will fail when
trying to open the socket. In this case it is better to unlink the old
socket and maybe lose some messages, than to continue without the
notification socket.

Of course this situation should not happen, but we should handle
it as gracefully as possible anyway.

https://bugzilla.redhat.com/show_bug.cgi?id=1099299
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-10-17 10:09:27 -04:00
parent 46849c3fb1
commit e7bc519620
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/manager.c
+15 -1
View File
@@ -565,7 +565,21 @@ static int manager_setup_notify(Manager *m) {
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;
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;
}
r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));