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

socket: pass minimal abstract socket names

Browse source
This commit is contained in:
Lennart Poettering 2010-07-11 02:23:11 +02:00
parent b574246b4f
commit b12c1e7cf7
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/manager.c
View file

@ -89,7 +89,7 @@ static int manager_setup_notify(Manager *m) {
else
strncpy(sa.un.sun_path+1, NOTIFY_SOCKET, sizeof(sa.un.sun_path)-1);
if (bind(m->notify_watch.fd, &sa.sa, sizeof(sa)) < 0) {
if (bind(m->notify_watch.fd, &sa.sa, sizeof(sa_family_t) + 1 + strlen(sa.un.sun_path+1)) < 0) {
log_error("bind() failed: %m");
return -errno;
}

10
src/socket-util.c
View file

@ -101,7 +101,7 @@ int socket_address_parse(SocketAddress *a, const char *s) {
a->sockaddr.un.sun_family = AF_UNIX;
memcpy(a->sockaddr.un.sun_path+1, s+1, l);
a->size = sizeof(struct sockaddr_un);
a->size = sizeof(sa_family_t) + 1 + l;
} else {
@ -198,11 +198,7 @@ int socket_address_verify(const SocketAddress *a) {
if (a->size > sizeof(sa_family_t)) {
if (a->sockaddr.un.sun_path[0] == 0) {
/* abstract */
if (a->size != sizeof(struct sockaddr_un))
return -EINVAL;
} else {
if (a->sockaddr.un.sun_path[0] != 0) {
char *e;
/* path */
@ -437,7 +433,7 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
if (strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0)
return false;
} else {
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0)
if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0)
return false;
}