picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

main: remove AF_UNIX sockets before binding

Browse source
This commit is contained in:
Lennart Poettering 2011-03-14 16:15:31 +01:00
parent f41de95966
commit 6f79c579ec
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dbus.c
View file

@ -955,6 +955,7 @@ static int bus_init_private(Manager *m) {
if (getpid() != 1)
return 0;
unlink("/dev/.run/systemd/private");
if (!(m->private_bus = dbus_server_listen("unix:path=/dev/.run/systemd/private", &error))) {
log_error("Failed to create private D-Bus server: %s", error.message);
r = -EIO;

4
src/manager.c
View file

@ -90,8 +90,10 @@ static int manager_setup_notify(Manager *m) {
if (getpid() != 1)
snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET_USER "/%llu", random_ull());
else
else {
unlink(NOTIFY_SOCKET_SYSTEM);
strncpy(sa.un.sun_path, NOTIFY_SOCKET_SYSTEM, sizeof(sa.un.sun_path));
}
if (sa.un.sun_path[0] == '@')
sa.un.sun_path[0] = 0;