summaryrefslogtreecommitdiff
path: root/libdaemon
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2017-09-06 11:47:53 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2017-09-06 11:47:53 +0200
commit03efec27123efb43c3350ceaf5675fd68d8b3f50 (patch)
treeef561bd99cabd38cf8eb889c053633a1d265a87b /libdaemon
parent3071837e21fae8907c1d584f9181e0589b9ce7e2 (diff)
downloadlvm2-03efec27123efb43c3350ceaf5675fd68d8b3f50.tar.gz
deamonize: restore detection of errors
Keep forked environment for daemon more strick and check even for nearly impossible to happen errors.
Diffstat (limited to 'libdaemon')
-rw-r--r--libdaemon/server/daemon-server.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 0950c2e16..2ffdf402d 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -377,15 +377,22 @@ static void _daemonise(daemon_state s)
exit(WEXITSTATUS(child_status));
}
- if (chdir("/"))
+ if (chdir("/")) {
+ perror("Cannot chdir to /");
exit(1);
+ }
- (void) dup2(fd, STDIN_FILENO);
- (void) dup2(fd, STDOUT_FILENO);
- (void) dup2(fd, STDERR_FILENO);
+ if ((dup2(fd, STDIN_FILENO) == -1) ||
+ (dup2(fd, STDOUT_FILENO) == -1) ||
+ (dup2(fd, STDERR_FILENO) == -1)) {
+ perror("Error setting terminal FDs to /dev/null");
+ exit(2);
+ }
- if (fd > STDERR_FILENO)
- (void) close(fd);
+ if ((fd > STDERR_FILENO) && close(fd)) {
+ perror("Failed to close /dev/null descriptor");
+ exit(3);
+ }
/* Switch to sysconf(_SC_OPEN_MAX) ?? */
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0)