X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=7b74cd6ca7e97b6df7844e6b3dbeaa8f8b2f6ad5;hp=148e13e444ef2c7ef8188e04baa3e1a189504a55;hb=8a6f278fd2606c0a8f133f05df83b2649eacf6c3;hpb=89f4574e0b1553c8e5dcbfc275e829a759b697f6

diff --git a/src/tincd.c b/src/tincd.c
index 148e13e4..7b74cd6c 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,16 +337,9 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
 	RSA *rsa_key;
 	FILE *f;
-	char *name = NULL;
+	char *name = get_name();
 	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;
-	}
-
 	fprintf(stderr, "Generating %d bits keys:\n", bits);
 	rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
@@ -386,8 +379,7 @@ static bool keygen(int bits) {
 	PEM_write_RSAPublicKey(f, rsa_key);
 	fclose(f);
 	free(filename);
-	if(name)
-		free(name);
+	free(name);
 
 	return true;
 }
@@ -475,8 +467,9 @@ static bool drop_privs() {
 			       "initgroups", strerror(errno));
 			return false;
 		}
-		endgrent();
-		endpwent();
+        // Not supported in android NDK
+		//endgrent();
+		//endpwent();
 	}
 	if (do_chroot) {
 		tzset();	/* for proper timestamps in logs */