From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Jul 2010 00:50:02 +0000 (+0200)
Subject: systemd: update systemd glue code
X-Git-Tag: dbus-1.4.0~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=265a3bb04a46d889b89ff0a5f6d4c93df092e0fb;p=platform%2Fupstream%2Fdbus.git

systemd: update systemd glue code
---

diff --git a/dbus/sd-daemon.c b/dbus/sd-daemon.c
index 5df70e3..3bb258d 100644
--- a/dbus/sd-daemon.c
+++ b/dbus/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;