summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-07 21:04:59 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-12 00:08:09 +0200
commitff2325c92c411e6718ae38d6976f54580ed57e86 (patch)
tree83ac55d24254aa06f2c51d3a0cfb8b6dd1032053
parentc9033c7ba609b9babde01a6540181352c3c39b8e (diff)
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.
-rw-r--r--dbus/sd-daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/sd-daemon.c b/dbus/sd-daemon.c
index 3bb258d3..1197372b 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;