From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Aug 2010 19:33:20 +0000 (+0200)
Subject: sd-daemon: fix compilation on old systems lacking SOCK_CLOEXEC
X-Git-Tag: v7~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c593cfe164bbdd063b8e8504be14f758b1f0a8c3

sd-daemon: fix compilation on old systems lacking SOCK_CLOEXEC
---

diff --git a/fixme b/fixme
index 55303f47b..919053219 100644
--- a/fixme
+++ b/fixme
@@ -73,12 +73,14 @@
 
 * if a service fails too often, make the service enter maintainence mode, and the socket, too.
 
-* send cgroup msg directly
-
 * don't show file not found msgs for irrelevant units
 
+* getty doesn't respawn
+
 External:
 
+* sysv functions should color when stdout is tty, not stdin
+
 * agetty should not modify baudrate
 
 * ck logging, ssh readahead
diff --git a/src/sd-daemon.c b/src/sd-daemon.c
index 3bb258d34..1197372b8 100644
--- a/src/sd-daemon.c
+++ b/src/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;