X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=29f1212814234ff2b7db709d2eb97449d5e23b8c;hb=880d74ad2d8a6d73c2e94ec54df542b88dc0c6f4;hp=0a99daad5ec9bc9406e5f5f7802e85d0ba148a29;hpb=d00d8dbb9b122a17ef93090de10396ebdd2c4a84;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 0a99daad..29f12128 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -277,6 +277,8 @@ static bool read_rsa_private_key(void) {
 	if(!fp) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading RSA private key file `%s': %s",
 			   fname, strerror(errno));
+		if(errno == ENOENT)
+			logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ?: ".");
 		free(fname);
 		return false;
 	}
@@ -780,8 +782,14 @@ static bool setup_myself(void) {
 			return false;
 	}
 
-	if(!read_rsa_private_key())
-		return false;
+	if(!read_rsa_private_key()) {
+		if(experimental) {
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Support for legacy protocol disabled.");
+		} else {
+			logger(DEBUG_ALWAYS, LOG_ERR, "No private keys available, cannot start tinc!");
+			return false;
+		}
+	}
 
 	/* Ensure myport is numeric */
 
@@ -1114,7 +1122,7 @@ void close_network_connections(void) {
 	if (!device_standby)
 		device_disable();
 
-	if(myport) free(myport);
+	free(myport);
 
 	if (device_fd >= 0)
 		io_del(&device_io);
@@ -1124,7 +1132,8 @@ void close_network_connections(void) {
 	exit_control();
 
 	free(myname);
-	myname = NULL;
+	free(scriptextension);
+	free(scriptinterpreter);
 
 	return;
 }