X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=33828bbc8f4ad0f55cf3e23730bb35b353e8a3af;hp=eb066abc64ca20571eea0b689b890b6498996f20;hb=b0ff879e7c68edd447328f3d806c1ad9e336fece;hpb=da9a1e8084a9b73306bdbc541ee8af938c3e7754

diff --git a/src/process.c b/src/process.c
index eb066abc..33828bbc 100644
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.7 2000/11/20 23:29:47 guus Exp $
+    $Id: process.c,v 1.1.2.13 2000/11/24 12:44:39 zarq Exp $
 */
 
 #include "config.h"
@@ -31,7 +31,9 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <stdlib.h>
 #include <unistd.h>
+#include <termios.h>
 
 #include <list.h>
 #include <pidfile.h>
@@ -40,6 +42,8 @@
 
 #include "conf.h"
 #include "process.h"
+#include "subnet.h"
+#include "connection.h"
 
 #include "system.h"
 
@@ -69,6 +73,58 @@ void memory_full(int size)
   exit(1);
 }
 
+/* Some functions the less gifted operating systems might lack... */
+
+#ifndef HAVE_FCLOSEALL
+int fcloseall(void)
+{
+  fflush(stdin);
+  fflush(stdout);
+  fflush(stderr);
+  fclose(stdin);
+  fclose(stdout);
+  fclose(stderr);
+}
+#endif
+
+int become_daemon(void)
+{
+  pid_t pid;
+  int fd;
+  
+  ppid = getpid();
+
+  if((pid = fork()) < 0)
+    {
+      perror("fork");
+      return -1;
+    }
+  if(pid) /* parent process */
+    {
+      signal(SIGTERM, parent_exit);
+      sleep(600); /* wait 10 minutes */
+      exit(1);
+    }
+
+  if((fd = open("/dev/tty", O_RDWR)) >= 0)
+    {
+      if(ioctl(fd, TIOCNOTTY, NULL))
+        {
+          perror("ioctl");
+          return -1;
+        }
+      close(fd);
+    }
+
+  if(setsid() < 0)
+    return -1;
+
+  kill(ppid, SIGTERM);
+
+  chdir("/");
+  fcloseall();
+}
+
 /*
   Close network connections, and terminate neatly
 */
@@ -140,17 +196,16 @@ cp
 */
 int detach(void)
 {
-  int fd;
-  pid_t pid;
 cp
   setup_signals();
 
+  if(do_detach)
+    if(become_daemon() < 0)
+      return -1;
+
   if(write_pidfile())
     return -1;
 
-  if(do_detach)
-    daemon(0, 0);
-
   openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
 
   if(debug_lvl > DEBUG_NOTHING)
@@ -174,6 +229,8 @@ void _execute_script(const char *name)
   int error = 0;
   char *scriptname;
   char *s;
+  int fd;
+  
 cp
   if(netname)
     {
@@ -207,14 +264,20 @@ cp
   fcloseall();
 
   /* Open standard input */
-  if(open("/dev/null", O_RDONLY) < 0)
+  if((fd = open("/dev/null", O_RDONLY)) < 0)
     {
       syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
       error = 1;
     }
+  if(dup2(fd, 0) != 0)
+    {
+      syslog(LOG_ERR, _("Couldn't assign /dev/null to standard input: %m"));
+      error = 1;
+    }
 
   if(!error)
     {
+      close(1);  /* fd #1 should be the first available filedescriptor now. */
       /* Standard output directly goes to syslog */
       openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
       /* Standard error as well */