X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=0cc7d06274b8f28e24b2bd154f2e0dfadbc0a210;hb=4bdf0e80ee4cd0d40eb6522dab05df9346a5b3d0;hp=814800e8969c6c62c7060f26786789ef8fb63671;hpb=5a132550deb58473285e5f91705d286aef47be71;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 814800e8..0cc7d062 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -205,7 +205,7 @@ static bool keygen(int bits) {
 	} else
 		fprintf(stderr, _("Done.\n"));
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
 	f = ask_and_open(filename, _("private RSA key"), "a");
 
 	if(!f)
@@ -225,9 +225,9 @@ static bool keygen(int bits) {
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
 	f = ask_and_open(filename, _("public RSA key"), "a");
 
@@ -256,7 +256,7 @@ static void make_names(void) {
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", netname);
+		xasprintf(&identname, "tinc.%s", netname);
 	else
 		identname = xstrdup("tinc");
 
@@ -264,12 +264,12 @@ 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)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
+				xasprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		RegCloseKey(key);
@@ -279,16 +279,16 @@ static void make_names(void) {
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
+		xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
 			fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
@@ -440,7 +440,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	// First handle commands that don't involve connecting to a running tinc daemon.
 
 	if(!strcasecmp(argv[optind], "generate-keys")) {
-		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024);
+		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {