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

diff --git a/src/process.c b/src/process.c
index 8fad5b0c..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.11 2000/11/22 22:05:37 guus Exp $
+    $Id: process.c,v 1.1.2.13 2000/11/24 12:44:39 zarq Exp $
 */
 
 #include "config.h"
@@ -42,6 +42,8 @@
 
 #include "conf.h"
 #include "process.h"
+#include "subnet.h"
+#include "connection.h"
 
 #include "system.h"
 
@@ -85,8 +87,7 @@ int fcloseall(void)
 }
 #endif
 
-#ifndef HAVE_DAEMON
-int daemon(int nochdir, int noclose)
+int become_daemon(void)
 {
   pid_t pid;
   int fd;
@@ -120,13 +121,9 @@ int daemon(int nochdir, int noclose)
 
   kill(ppid, SIGTERM);
 
-  if(!nochdir)
-    chdir("/");
-
-  if(!noclose)
-    fcloseall();
+  chdir("/");
+  fcloseall();
 }
-#endif
 
 /*
   Close network connections, and terminate neatly
@@ -199,13 +196,12 @@ cp
 */
 int detach(void)
 {
-  int fd;
-  pid_t pid;
 cp
   setup_signals();
 
   if(do_detach)
-    daemon(0, 0);
+    if(become_daemon() < 0)
+      return -1;
 
   if(write_pidfile())
     return -1;