summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-06 21:33:20 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-06 21:34:11 +0200
commitc593cfe164bbdd063b8e8504be14f758b1f0a8c3 (patch)
tree88bfbef0aabea9cf585ac9b7ef3e90752f92eb04
parentb9911f4434f93256e6adc563f3ff96419118eaad (diff)
downloadsystemd-c593cfe164bbdd063b8e8504be14f758b1f0a8c3.tar.gz
sd-daemon: fix compilation on old systems lacking SOCK_CLOEXEC
-rw-r--r--fixme6
-rw-r--r--src/sd-daemon.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/fixme b/fixme
index 55303f47b5..9190532197 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 3bb258d341..1197372b81 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;