X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=ed69808d6c1a882229c1299d586305b2bda0db75;hb=5c76d51d0badd8a35e3883f18a5792e830448768;hp=73d46c998e2db1d9bf20c6d69289c3ac15405183;hpb=01cb1961eac33de9e9d9cecd0910850a2cb549c3;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 73d46c99..ed69808d 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -215,7 +215,7 @@ static bool read_ecdsa_private_key(void) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading Ed25519 private key file `%s': %s", fname, strerror(errno));
 
 		if(errno == ENOENT) {
-			logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 keypair with `tinc -n %s generate-ed25519-keys'.", netname ? : ".");
+			logger(DEBUG_ALWAYS, LOG_INFO, "Create an Ed25519 keypair with `tinc -n %s generate-ed25519-keys'.", netname ? netname : ".");
 		}
 
 		free(fname);
@@ -307,7 +307,7 @@ static bool read_rsa_private_key(void) {
 		       fname, strerror(errno));
 
 		if(errno == ENOENT) {
-			logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ? : ".");
+			logger(DEBUG_ALWAYS, LOG_INFO, "Create an RSA keypair with `tinc -n %s generate-rsa-keys'.", netname ? netname : ".");
 		}
 
 		free(fname);
@@ -687,7 +687,7 @@ bool setup_myself_reloadable(void) {
 		keylifetime = 3600;
 	}
 
-	if (!get_config_bool(lookup_config(config_tree, "AutoConnect"), &autoconnect)) {
+	if(!get_config_bool(lookup_config(config_tree, "AutoConnect"), &autoconnect)) {
 		autoconnect = true;
 	}
 
@@ -975,6 +975,7 @@ static bool setup_myself(void) {
 		myself->incipher = NULL;
 	} else if(!(myself->incipher = cipher_open_by_name(cipher))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
+		free(cipher);
 		return false;
 	}
 
@@ -1002,6 +1003,7 @@ static bool setup_myself(void) {
 		myself->indigest = NULL;
 	} else if(!(myself->indigest = digest_open_by_name(digest, maclength))) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
+		free(digest);
 		return false;
 	}