update sd-daemon.[ch]

diff --git a/udev/sd-daemon.c b/udev/sd-daemon.c
index e12fb0483abfb8c4d690ffc62ee51622daa245fb..6d1eebff07c68a977abc325a3c9c3592839a24ee 100644 (file)
--- a/udev/sd-daemon.c
+++ b/udev/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 (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;
                         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 (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 &&
                 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 (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)
                 return -EINVAL;
 
         if (sockaddr.sa.sa_family != AF_UNIX)

diff --git a/udev/sd-daemon.h b/udev/sd-daemon.h
index fdf3cc03548cce17bd94bb5811dd00edccbd761e..4b853a15bec92fa98785fdb6638cfd2d22f67dd9 100644 (file)
--- a/udev/sd-daemon.h
+++ b/udev/sd-daemon.h
@@ -185,7 +185,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
      READY=1      Tells systemd that daemon startup is finished (only
                   relevant for services of Type=notify). The passed
                   argument is a boolean "1" or "0". Since there is
      READY=1      Tells systemd that daemon startup is finished (only
                   relevant for services of Type=notify). The passed
                   argument is a boolean "1" or "0". Since there is

-                  little value in signalling non-readiness the only
+                  little value in signaling non-readiness the only

                   value daemons should send is "READY=1".
 
      STATUS=...   Passes a single-line status string back to systemd
                   value daemons should send is "READY=1".
 
      STATUS=...   Passes a single-line status string back to systemd


@@ -206,7 +206,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
                   fork off the process itself. Example: "MAINPID=4711"
 
   Daemons can choose to send additional variables. However, it is
                   fork off the process itself. Example: "MAINPID=4711"
 
   Daemons can choose to send additional variables. However, it is

-  recommened to prefix variable names not listed above with X_.
+  recommended to prefix variable names not listed above with X_.

 
   Returns a negative errno-style error code on failure. Returns > 0
   if systemd could be notified, 0 if it couldn't possibly because
 
   Returns a negative errno-style error code on failure. Returns > 0
   if systemd could be notified, 0 if it couldn't possibly because


@@ -252,7 +252,7 @@ int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(
   fine. You should NOT protect them with a call to this function. Also
   note that this function checks whether the system, not the user
   session is controlled by systemd. However the functions above work
   fine. You should NOT protect them with a call to this function. Also
   note that this function checks whether the system, not the user
   session is controlled by systemd. However the functions above work

-  for both session and system services.
+  for both user and system services.

 
   See sd_booted(3) for more information.
 */
 
   See sd_booted(3) for more information.
 */