Releasing 1.0.20.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index a1be971..aaad1da 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-2013 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>
@@ -337,15 +337,8 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
-       char *name = NULL;
-       char *filename;
-
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name && !check_id(name)) {
-               fprintf(stderr, "Invalid name for myself!\n");
-               return false;
-       }
+       char *name = get_name();
+       char *pubname, *privname;
 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
@@ -356,15 +349,13 @@ static bool keygen(int bits) {
        } else
                fprintf(stderr, "Done.\n");
 
-       xasprintf(&filename, "%s/rsa_key.priv", confbase);
-       f = ask_and_open(filename, "private RSA key");
+       xasprintf(&privname, "%s/rsa_key.priv", confbase);
+       f = ask_and_open(privname, "private RSA key");
+       free(privname);
 
        if(!f)
                return false;
 
-       if(disable_old_keys(f))
-               fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-  
 #ifdef HAVE_FCHMOD
        /* Make it unreadable for others. */
        fchmod(fileno(f), 0600);
@@ -373,27 +364,22 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);
-       free(filename);
 
        if(name)
-               xasprintf(&filename, "%s/hosts/%s", confbase, name);
+               xasprintf(&pubname, "%s/hosts/%s", confbase, name);
        else
-               xasprintf(&filename, "%s/rsa_key.pub", confbase);
+               xasprintf(&pubname, "%s/rsa_key.pub", confbase);
 
-       f = ask_and_open(filename, "public RSA key");
+       f = ask_and_open(pubname, "public RSA key");
+       free(pubname);
 
        if(!f)
                return false;
 
-       if(disable_old_keys(f))
-               fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-
        fputc('\n', f);
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
-       free(filename);
-       if(name)
-               free(name);
+       free(name);
 
        return true;
 }
@@ -405,7 +391,7 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
        HKEY key;
        char installdir[1024] = "";
-       long len = sizeof(installdir);
+       DWORD len = sizeof(installdir);
 #endif
 
        if(netname)
@@ -415,7 +401,7 @@ static void make_names(void) {
 
 #ifdef HAVE_MINGW
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
-               if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
+               if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
                        if(!logfilename)
                                xasprintf(&logfilename, "%s/log/%s.log", identname);
                        if(!confbase) {
@@ -481,8 +467,11 @@ static bool drop_privs() {
                               "initgroups", strerror(errno));
                        return false;
                }
+#ifndef __ANDROID__
+// Not supported in android NDK
                endgrent();
                endpwent();
+#endif
        }
        if (do_chroot) {
                tzset();        /* for proper timestamps in logs */
@@ -524,7 +513,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2011 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2013 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"
@@ -545,6 +534,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! */