summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-13 02:45:39 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-13 02:45:39 +0200
commit0b78399f4f9d4b3cd53bf9f0ee923c1001bc2645 (patch)
treefc245cf08816c0a4a775f1dd3c530850cfae4c9c
parent76256da5f1fc4afe60ff95bd8a98b9a41fa3e148 (diff)
systemd: update sd-daemon.[ch] from upśtream
-rw-r--r--avahi-daemon/sd-daemon.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/avahi-daemon/sd-daemon.c b/avahi-daemon/sd-daemon.c
index 5df70e3..3bb258d 100644
--- a/avahi-daemon/sd-daemon.c
+++ b/avahi-daemon/sd-daemon.c
@@ -381,7 +381,11 @@ int sd_notify(int unset_environment, const char *state) {
memset(&msghdr, 0, sizeof(msghdr));
msghdr.msg_name = &sockaddr;
- msghdr.msg_namelen = sizeof(struct sockaddr_un);
+ msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e);
+
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
+
msghdr.msg_iov = &iovec;
msghdr.msg_iovlen = 1;
msghdr.msg_control = &control;