libdaemon: set CLOEXEC flag on systemd socket

all sockets opened by a daemon or handed over by systemd
have to have CLOEXEC flag set. Otherwise we get nasty
warnings about leaking descriptors in processes spawned by
daemon.

diff --git a/WHATS_NEW b/WHATS_NEW
index 3555063459382524742c04956f7a74ec38015f8e..cd4abfee208f825c1f333a8a2c11a373b7c9779d 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.117 - 
 ====================================
+  set CLOEXEC flag on file descriptors originating in libdaemon
 
 Version 2.02.116 - 30th January 2015
 ====================================

diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 3dffdbb0bd0e0e88192a707f7d1e527f0a115016..5ccf4e98cefb7638d5dbb2bc61201c7b03b3cf4b 100644 (file)
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -221,9 +221,7 @@ static int _open_socket(daemon_state s)
                goto error;
        }
 
-       /* Set Close-on-exec & non-blocking */
-       if (fcntl(fd, F_SETFD, 1))
-               fprintf(stderr, "setting CLOEXEC on socket fd %d failed: %s\n", fd, strerror(errno));
+       /* Set non-blocking */
        if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK))
                fprintf(stderr, "setting O_NONBLOCK on socket fd %d failed: %s\n", fd, strerror(errno));
 
@@ -572,6 +570,10 @@ void daemon_start(daemon_state s)
                        failed = 1;
        }
 
+       /* Set Close-on-exec */
+       if (fcntl(s.socket_fd, F_SETFD, 1))
+               fprintf(stderr, "setting CLOEXEC on socket fd %d failed: %s\n", s.socket_fd, strerror(errno));
+
        /* Signal parent, letting them know we are ready to go. */
        if (!s.foreground)
                kill(getppid(), SIGTERM);