[systemd-commits] src/sd-daemon.c

[Lennart Poettering]

 src/sd-daemon.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b7f426649b0ff4ea37ebe41f16ddeb42f1defc15
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 7 19:01:26 2010 +0200

    sd-daemon: in some places sizeof(sa_family_t) actually does make sense

diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index e12fb04..6d1eebf 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)