Close stdin, stdout and stderr, when the process is told to fork(). Also, fork twice to eliminate session control.

1 files changed, 28 insertions, 5 deletions

diff --git a/kolabd/__init__.py b/kolabd/__init__.py
index 6a0fd32..df92138 100644
--- a/kolabd/__init__.py
+++ b/kolabd/__init__.py
@@ -172,16 +172,39 @@ class KolabDaemon(object):
             log.error(_("Could not change real and effective uid and/or gid"))
 
         try:
-            pid = 1
+            pid = os.getpid()
+
             if conf.fork_mode:
                 pid = os.fork()
 
-            if pid == 0:
+            if pid > 0 and not conf.fork_mode:
+                self.do_sync()
+
+            elif pid > 0:
+                sys.exit(0)
+
+            else:
+                # Give up the session, all control,
+                # all open file descriptors, see #5151
+                os.chdir("/")
+                os.umask(0)
+                os.setsid()
+
+                pid = os.fork()
+
+                if pid > 0:
+                    sys.exit(0)
+
+                sys.stderr.flush()
+                sys.stdout.flush()
+
+                os.close(0)
+                os.close(1)
+                os.close(2)
+
                 log.remove_stdout_handler()
-                self.write_pid()
                 self.set_signal_handlers()
-                self.do_sync()
-            elif not conf.fork_mode:
+                self.write_pid()
                 self.do_sync()
 
         except SystemExit, errcode: