X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=c033e22004564827aae5e447f98a6090d1a292bf;hb=6dfdb323612184529b4b83c1be914dda8262de47;hp=3991bd2b366cc75ecff9f7242adebedcf8aece42;hpb=9ade39b7d5564fb6f5a41946c9a23cfa7851a19f;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 3991bd2b..c033e220 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -229,7 +229,7 @@ static bool read_rsa_private_key(void) {
 		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
 		free(n);
 		free(d);
-		return true;
+		return result;
 	}
 
 	/* Else, check for PrivateKeyFile statement and read it */
@@ -574,8 +574,11 @@ static bool setup_myself(void) {
 	myself = new_node();
 	myself->connection = new_connection();
 
-	myself->hostname = xstrdup("MYSELF");
-	myself->connection->hostname = xstrdup("MYSELF");
+	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
+		myport = xstrdup("655");
+
+	xasprintf(&myself->hostname, "MYSELF port %s", myport);
+	myself->connection->hostname = xstrdup(myself->hostname);
 
 	myself->connection->options = 0;
 	myself->connection->protocol_major = PROT_MAJOR;
@@ -603,9 +606,6 @@ static bool setup_myself(void) {
 	if(!read_rsa_private_key())
 		return false;
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
-
 	if(!atoi(myport)) {
 		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
 		sockaddr_t sa;
@@ -916,6 +916,8 @@ static bool setup_myself(void) {
 		return false;
 	}
 
+	last_config_check = time(NULL);
+
 	return true;
 }