X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=264b21dc349345ada752b398aa3e6cfbac315a1a;hp=6491bfc28d0e7bbd4e9d379f961fedf589d06374;hb=785684f0ec5c9250788b4b32c0eab3f358c9db61;hpb=408ca91766088b6c2d38e198b0692bf394b41248

diff --git a/src/process.c b/src/process.c
index 6491bfc2..264b21dc 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.5 2000/11/20 19:12:13 guus Exp $
+    $Id: process.c,v 1.1.2.9 2000/11/22 17:49:16 zarq Exp $
 */
 
 #include "config.h"
@@ -44,7 +44,7 @@
 #include "system.h"
 
 /* A list containing all our children */
-list_t *child_pids;
+list_t *child_pids = NULL;
 
 /* If zero, don't detach from the terminal. */
 int do_detach = 1;
@@ -55,6 +55,13 @@ extern char *identname;
 extern char *pidfilename;
 extern char **g_argv;
 
+void init_processes(void)
+{
+cp
+  child_pids = list_new();
+cp
+}
+
 void memory_full(int size)
 {
   syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
@@ -67,6 +74,7 @@ void memory_full(int size)
 */
 void cleanup_and_exit(int c)
 {
+cp
   close_network_connections();
 
   if(debug_lvl > DEBUG_NOTHING)
@@ -84,7 +92,7 @@ void cleanup_and_exit(int c)
 int write_pidfile(void)
 {
   int pid;
-
+cp
   if((pid = check_pid(pidfilename)))
     {
       if(netname)
@@ -98,7 +106,7 @@ int write_pidfile(void)
   /* if it's locked, write-protected, or whatever */
   if(!write_pid(pidfilename))
     return 1;
-
+cp
   return 0;
 }
 
@@ -108,7 +116,7 @@ int write_pidfile(void)
 int kill_other(void)
 {
   int pid;
-
+cp
   if(!(pid = read_pid(pidfilename)))
     {
       if(netname)
@@ -123,7 +131,7 @@ int kill_other(void)
   if(kill(pid, SIGTERM) && errno == ESRCH)
     fprintf(stderr, _("Removing stale lock file.\n"));
   remove_pid(pidfilename);
-
+cp
   return 0;
 }
 
@@ -134,7 +142,7 @@ int detach(void)
 {
   int fd;
   pid_t pid;
-
+cp
   setup_signals();
 
   if(write_pidfile())
@@ -152,7 +160,7 @@ int detach(void)
     syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
 
   xalloc_fail_func = memory_full;
-
+cp
   return 0;
 }
 
@@ -166,7 +174,9 @@ void _execute_script(const char *name)
   int error = 0;
   char *scriptname;
   char *s;
-
+  int fd;
+  
+cp
   if(netname)
     {
       asprintf(&s, "NETNAME=%s", netname);
@@ -199,14 +209,20 @@ void _execute_script(const char *name)
   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 */
@@ -237,7 +253,7 @@ void _execute_script(const char *name)
 int execute_script(const char *name)
 {
   pid_t pid;
-
+cp
   if((pid = fork()) < 0)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
@@ -247,10 +263,10 @@ int execute_script(const char *name)
 
   if(pid)
     {
-      list_append(child_pids, (void*)(int)pid);
+      list_append(child_pids, &pid);
       return 0;
     }
-
+cp
   /* Child here */
   _execute_script(name);
 }
@@ -264,7 +280,7 @@ int check_child(void *data)
 {
   pid_t pid;
   int status;
-
+cp
   pid = (pid_t) data;
   pid = waitpid(pid, &status, WNOHANG);
   if(WIFEXITED(status))
@@ -282,7 +298,7 @@ int check_child(void *data)
 	}
       return -1;
     }
-
+cp
   /* Child is still running */
   return 0;
 }