From: Guus Sliepen Date: Wed, 22 Nov 2000 19:14:09 +0000 (+0000) Subject: - Write pidfile AFTER detaching... X-Git-Tag: release-1.0pre4~146 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=394ed3fb174bb629bfb4b441fe58842562f955de;p=tinc - Write pidfile AFTER detaching... - Minor cleanups --- diff --git a/lib/rbl.c b/lib/rbl.c index ab35aee6..1a405350 100644 --- a/lib/rbl.c +++ b/lib/rbl.c @@ -17,14 +17,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: rbl.c,v 1.1.2.10 2000/11/22 18:54:07 guus Exp $ + $Id: rbl.c,v 1.1.2.11 2000/11/22 19:14:08 guus Exp $ */ #include "config.h" #include #include -#include #include "rbl.h" #include diff --git a/src/process.c b/src/process.c index 264b21dc..29e49fa4 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.9 2000/11/22 17:49:16 zarq Exp $ + $Id: process.c,v 1.1.2.10 2000/11/22 19:14:08 guus Exp $ */ #include "config.h" @@ -145,12 +145,12 @@ int detach(void) cp setup_signals(); - if(write_pidfile()) - return -1; - if(do_detach) daemon(0, 0); + if(write_pidfile()) + return -1; + openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON); if(debug_lvl > DEBUG_NOTHING) diff --git a/src/tincd.c b/src/tincd.c index d2ce14d0..18791cc8 100644 --- a/src/tincd.c +++ b/src/tincd.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: tincd.c,v 1.10.4.33 2000/11/22 16:19:07 zarq Exp $ + $Id: tincd.c,v 1.10.4.34 2000/11/22 19:14:09 guus Exp $ */ #include "config.h" @@ -94,11 +94,6 @@ char **g_argv; /* a copy of the cmdline arguments */ char **environment; /* A pointer to the environment on startup */ -void cleanup_and_exit(int); -int kill_other(void); -void make_names(void); -int write_pidfile(void); - static struct option const long_options[] = { { "config", required_argument, NULL, 'c' },