From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 7 Aug 2010 19:04:59 +0000 (+0200)
Subject: sd-daemon: update from upstream
X-Git-Tag: dbus-1.4.0~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff2325c92c411e6718ae38d6976f54580ed57e86;p=thirdparty%2Fdbus.git

sd-daemon: update from upstream

This updates the sd-daemon.[ch] copy from upstream, which makes sure
thet the code compiles even if SOCK_CLOEXEC is not supported.
---

diff --git a/dbus/sd-daemon.c b/dbus/sd-daemon.c
index 3bb258d34..1197372b8 100644
--- a/dbus/sd-daemon.c
+++ b/dbus/sd-daemon.c
@@ -325,7 +325,7 @@ int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t
 }
 
 int sd_notify(int unset_environment, const char *state) {
-#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
         return 0;
 #else
         int fd = -1, r;