X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=53f91e87367fca00e234688c6edcf14ca3346ada;hp=d0b00b0dda48ad7ac0aaa43f6b0bd9934ab69302;hb=2a3e343c7228d5f07176e4b404d895c7adc5bdf9;hpb=5b0f5ad958d6db4e73aebc5ee6c608cdae81b7b5

diff --git a/src/tincd.c b/src/tincd.c
index d0b00b0d..53f91e87 100644
--- 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>
@@ -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,8 +349,9 @@ 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;
@@ -370,14 +364,14 @@ 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;
@@ -385,9 +379,7 @@ static bool keygen(int bits) {
 	fputc('\n', f);
 	PEM_write_RSAPublicKey(f, rsa_key);
 	fclose(f);
-	free(filename);
-	if(name)
-		free(name);
+	free(name);
 
 	return true;
 }
@@ -475,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 */
@@ -518,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-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"
@@ -539,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! */