diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-11 02:23:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-11 02:23:11 +0200 |
| commit | b12c1e7cf744a5e28db5a29e89377496893c1ab8 (patch) | |
| tree | 722821c2505b3a18b660b1120ec994d2ae016d3d | |
| parent | b574246b4f8e4eb86c29c38c7df47b541b68188a (diff) | |
socket: pass minimal abstract socket names
| -rw-r--r-- | src/manager.c | 2 | ||||
| -rw-r--r-- | src/socket-util.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/manager.c b/src/manager.c index d26541d3e..6dfef713e 100644 --- a/src/manager.c +++ b/src/manager.c @@ -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; } diff --git a/src/socket-util.c b/src/socket-util.c index 5463ffbcb..e6e3784bc 100644 --- a/src/socket-util.c +++ b/src/socket-util.c @@ -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; } |