j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Browse source 
Conflicts:
	src/logger.c
	src/net_setup.c
This commit is contained in:
Guus Sliepen 2012-03-26 19:06:39 +01:00
commit 1d9dacb1f2
4 changed files with 151 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tincd.c
View file

@ -389,6 +389,12 @@ int main(int argc, char **argv) {
g_argv = argv;
if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid())
do_detach = false;
#ifdef HAVE_UNSETENV
unsetenv("LISTEN_PID");
#endif
init_configuration(&config_tree);
/* Slllluuuuuuurrrrp! */