From 0e098b15c76e222f7de381203c0c35a75a5b2f24 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Oct 2010 02:34:17 +0200
Subject: util: never use sizeof(sa_family_t) when calculating sockaddr sizes

---
 src/reply-password.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/reply-password.c')

diff --git a/src/reply-password.c b/src/reply-password.c
index 236fdcc94c..24d73a798e 100644
--- a/src/reply-password.c
+++ b/src/reply-password.c
@@ -31,6 +31,7 @@
 #include <sys/stat.h>
 #include <sys/signalfd.h>
 #include <getopt.h>
+#include <stddef.h>
 
 #include "log.h"
 #include "macro.h"
@@ -50,7 +51,7 @@ static int send_on_socket(int fd, const char *socket_name, const void *packet, s
         sa.un.sun_family = AF_UNIX;
         strncpy(sa.un.sun_path+1, socket_name, sizeof(sa.un.sun_path)-1);
 
-        if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, sizeof(sa_family_t) + 1 + strlen(socket_name)) < 0) {
+        if (sendto(fd, packet, size, MSG_NOSIGNAL, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(socket_name)) < 0) {
                 log_error("Failed to send: %m");
                 return -1;
         }
-- 
cgit v1.2.3-54-g00ecf