diff options
Diffstat (limited to 'libdaemon')
| -rw-r--r-- | libdaemon/server/daemon-server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 1e900261c..aeb1870a3 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -326,7 +326,7 @@ static void _remove_lockfile(const char *file) static void _daemonise(daemon_state s) { int child_status; - int fd; + int fd, ffd; pid_t pid; struct rlimit rlim; struct timeval tval; @@ -394,17 +394,17 @@ static void _daemonise(daemon_state s) /* Switch to sysconf(_SC_OPEN_MAX) ?? */ if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) - fd = 256; /* just have to guess */ + ffd = 256; /* just have to guess */ else - fd = rlim.rlim_cur; + ffd = rlim.rlim_cur; - for (--fd; fd > STDERR_FILENO; fd--) { + for (--ffd; ffd > STDERR_FILENO; ffd--) { #ifdef __linux__ /* Do not close fds preloaded by systemd! */ - if (_systemd_activation && fd == SD_FD_SOCKET_SERVER) + if (_systemd_activation && ffd == SD_FD_SOCKET_SERVER) continue; #endif - (void) close(fd); + (void) close(ffd); } setsid(); |