summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-10-07 19:01:26 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-07 19:01:26 +0200
commitb7f426649b0ff4ea37ebe41f16ddeb42f1defc15 (patch)
tree094dfb5765717bcabdff12a2a1339676fa558213 /src
parent68ce1b7f2d70db4a248b62e602086d7420a99e3b (diff)
sd-daemon: in some places sizeof(sa_family_t) actually does make sense
Diffstat (limited to 'src')
-rw-r--r--src/sd-daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index e12fb0483a..6d1eebff07 100644
--- a/src/sd-daemon.c
+++ b/src/sd-daemon.c
@@ -228,7 +228,7 @@ int sd_is_socket(int fd, int family, int type, int listening) {
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l < offsetof(struct sockaddr_un, sun_path))
+ if (l < sizeof(sa_family_t))
return -EINVAL;
return sockaddr.sa.sa_family == family;
@@ -254,7 +254,7 @@ int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l < offsetof(struct sockaddr_un, sun_path))
+ if (l < sizeof(sa_family_t))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_INET &&
@@ -296,7 +296,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
if (getsockname(fd, &sockaddr.sa, &l) < 0)
return -errno;
- if (l < offsetof(struct sockaddr_un, sun_path))
+ if (l < sizeof(sa_family_t))
return -EINVAL;
if (sockaddr.sa.sa_family != AF_UNIX)