X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=5fedd6927174d65e151cadf4338639228f9a6880;hp=c4e8fad3746cd5d11a430a245b41e2a72563a788;hb=0d0dfd0852e9b2c9a7660880966a3c84790d5ea2;hpb=0966cca8ab6dcde2747c717f21d73fd332e04242

diff --git a/src/tincd.c b/src/tincd.c
index c4e8fad3..5fedd692 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -292,6 +292,18 @@ static bool keygen(int bits)
 	char *name = NULL;
 	char *filename;
 
+	get_config_string(lookup_config(config_tree, "Name"), &name);
+
+	if(name) {
+		if(!check_id(name)) {
+			fprintf(stderr, _("Invalid name for myself!\n"));
+			return false;
+		}
+		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		free(name);
+	} else
+		asprintf(&filename, "%s/rsa_key.pub", confbase);
+
 	fprintf(stderr, _("Generating %d bits keys:\n"), bits);
 	rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
@@ -319,13 +331,6 @@ static bool keygen(int bits)
 	fclose(f);
 	free(filename);
 
-	get_config_string(lookup_config(config_tree, "Name"), &name);
-
-	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
-	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
-
 	f = ask_and_open(filename, _("public RSA key"), "a");
 
 	if(!f)