chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udevd - switch socket path to abstract namespace
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index f8b8c27ee4ad51a0f6679aa7e71969247035198a..24cf9c9a7cf8c5a491c63483fff09f4a91455b70 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-325,7
+325,6
@@
static void sig_handler(int signum)
case SIGINT:
case SIGTERM:
unlink(UDEVD_LOCK);
case SIGINT:
case SIGTERM:
unlink(UDEVD_LOCK);
- unlink(UDEVD_SOCK);
exit(20 + signum);
break;
default:
exit(20 + signum);
break;
default:
@@
-378,9
+377,9
@@
int main(int argc, char *argv[])
memset(&saddr, 0x00, sizeof(saddr));
saddr.sun_family = AF_LOCAL;
memset(&saddr, 0x00, sizeof(saddr));
saddr.sun_family = AF_LOCAL;
- strcpy(saddr.sun_path, UDEVD_SOCK);
+ /* use abstract namespace for socket path */
+ strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
- unlink(UDEVD_SOCK);
ssock = socket(AF_LOCAL, SOCK_STREAM, 0);
if (ssock == -1) {
dbg("error getting socket");
ssock = socket(AF_LOCAL, SOCK_STREAM, 0);
if (ssock == -1) {
dbg("error getting socket");
@@
-426,6
+425,5
@@
int main(int argc, char *argv[])
}
exit:
close(ssock);
}
exit:
close(ssock);
- unlink(UDEVD_SOCK);
exit(1);
}
exit(1);
}