aboutsummaryrefslogtreecommitdiff
path: root/src/supervise-daemon/supervise-daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/supervise-daemon/supervise-daemon.c')
-rw-r--r--src/supervise-daemon/supervise-daemon.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/supervise-daemon/supervise-daemon.c b/src/supervise-daemon/supervise-daemon.c
index e36d0314..f0f298d2 100644
--- a/src/supervise-daemon/supervise-daemon.c
+++ b/src/supervise-daemon/supervise-daemon.c
@@ -22,11 +22,6 @@
#define ONE_SECOND 1000000000
#define ONE_MS 1000000
-#ifdef HAVE_CLOSE_RANGE
-/* For close_range() */
-# define _GNU_SOURCE
-#endif
-
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
@@ -203,18 +198,6 @@ static inline int ioprio_set(int which RC_UNUSED, int who RC_UNUSED,
}
#endif
-#ifndef CLOSE_RANGE_CLOEXEC
-# define CLOSE_RANGE_CLOEXEC (1U << 2)
-#endif
-#ifndef HAVE_CLOSE_RANGE
-static inline int close_range(int first RC_UNUSED,
- int last RC_UNUSED,
- unsigned int flags RC_UNUSED)
-{
- return -1;
-}
-#endif
-
static void cleanup(void)
{
free(changeuser);
@@ -582,9 +565,8 @@ RC_NORETURN static void child_process(char *exec, char **argv)
if (redirect_stderr || rc_yesno(getenv("EINFO_QUIET")))
dup2(stderr_fd, STDERR_FILENO);
- if (close_range(3, UINT_MAX, CLOSE_RANGE_CLOEXEC) < 0)
- for (i = getdtablesize() - 1; i >= 3; --i)
- fcntl(i, F_SETFD, FD_CLOEXEC);
+ cloexec_fds_from(3);
+
cmdline = make_cmdline(argv);
syslog(LOG_INFO, "Child command line: %s", cmdline);
free(cmdline);