shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

libdaemon: set CLOEXEC flag on systemd socket

Browse Source 
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.
This commit is contained in:
Ondrej Kozina 2015-01-30 15:15:24 +01:00
parent 9dd81df8b2
commit f73526f58c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.117 - Version 2.02.117 -
==================================== ====================================
set CLOEXEC flag on file descriptors originating in libdaemon
Version 2.02.116 - 30th January 2015 Version 2.02.116 - 30th January 2015
==================================== ====================================

8
libdaemon/server/daemon-server.c
View File

@ -221,9 +221,7 @@ static int _open_socket(daemon_state s)
goto error; goto error;
} }
/* Set Close-on-exec & non-blocking */ /* Set non-blocking */
if (fcntl(fd, F_SETFD, 1))
fprintf(stderr, "setting CLOEXEC on socket fd %d failed: %s\n", fd, strerror(errno));
if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK)) 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)); 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; 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. */ /* Signal parent, letting them know we are ready to go. */
if (!s.foreground) if (!s.foreground)
kill(getppid(), SIGTERM); kill(getppid(), SIGTERM);