Merge branch 'master' into 1.1

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index a78ca0c..fc92f0b 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -177,9 +177,7 @@ static bool parse_options(int argc, char **argv) {
                                break;
 
                        case 'n':                               /* net name given */
-                               /* netname "." is special: a "top-level name" */
-                               netname = strcmp(optarg, ".") != 0 ?
-                                               xstrdup(optarg) : NULL;
+                               netname = xstrdup(optarg);
                                break;
 
                        case 'o':                               /* option */
@@ -228,6 +226,21 @@ static bool parse_options(int argc, char **argv) {
                }
        }
 
+       if(!netname && (netname = getenv("NETNAME")))
+               netname = xstrdup(netname);
+
+       /* netname "." is special: a "top-level name" */
+
+       if(netname && (!*netname || !strcmp(netname, "."))) {
+               free(netname);
+               netname = NULL;
+       }
+
+       if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
+               fprintf(stderr, "Invalid character in netname!\n");
+               return false;
+       }
+
        return true;
 }
 
@@ -250,15 +263,15 @@ static void make_names(void) {
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
                        if(!logfilename)
-                               xasprintf(&logfilename, "%s/log/%s.log", identname);
+                               xasprintf(&logfilename, "%s" SLASH "log" SLASH "%s.log", identname);
                        if(!confbase) {
                                if(netname)
-                                       xasprintf(&confbase, "%s/%s", installdir, netname);
+                                       xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }
                        if(!pidfilename)
-                               xasprintf(&pidfilename, "%s/pid", confbase);
+                               xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
                }
                RegCloseKey(key);
                if(*installdir)
@@ -267,19 +280,19 @@ static void make_names(void) {
 #endif
 
        if(!logfilename)
-               xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
+               xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
        if(!pidfilename)
-               xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+               xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
 
        if(netname) {
                if(!confbase)
-                       xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
+                       xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
                else
                        logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
        } else {
                if(!confbase)
-                       xasprintf(&confbase, CONFDIR "/tinc");
+                       xasprintf(&confbase, CONFDIR SLASH "tinc");
        }
 }
 
@@ -316,8 +329,11 @@ static bool drop_privs(void) {
                               "initgroups", strerror(errno));
                        return false;
                }
+#ifndef __ANDROID__
+// Not supported in android NDK
                endgrent();
                endpwent();
+#endif
        }
        if (do_chroot) {
                tzset();        /* for proper timestamps in logs */
@@ -359,7 +375,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
-               printf("Copyright (C) 1998-2011 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"
@@ -382,13 +398,14 @@ int main(int argc, char **argv) {
 
        openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
-       if(!event_init()) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing libevent!");
-               return 1;
-       }
-
        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! */
@@ -433,6 +450,11 @@ int main2(int argc, char **argv) {
        }
 #endif
 
+       if(!event_init()) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing libevent!");
+               return 1;
+       }
+
        /* Setup sockets and open device. */
 
        if(!setup_network())