X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=dd6c58f1485608bd499d4e57ff5d54ee1cce1f7d;hb=1aa8ac8c41ab8580fce1956086d7e6c7e84a09ee;hp=3ac5a6796fd5c453f2527078395fee0db9fa3160;hpb=4436af55e55e79b496264fe114039fbc1198d71f;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 3ac5a679..dd6c58f1 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -184,8 +184,7 @@ void load_all_nodes(void) {
 		read_host_config(&config, ent->d_name, true);
 
 		if(!n) {
-			n = new_node();
-			n->name = xstrdup(ent->d_name);
+			n = new_node(ent->d_name);
 			node_add(n);
 		}
 
@@ -675,6 +674,7 @@ static bool add_listen_address(char *address, bool bindto) {
 		}
 
 		if(listen_sockets >= MAXSOCKETS) {
+			listen_sockets = MAXSOCKETS;
 			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			freeaddrinfo(ai);
 			return false;
@@ -764,10 +764,9 @@ static bool setup_myself(void) {
 	}
 
 	myname = xstrdup(name);
-	myself = new_node();
+	myself = new_node(name);
 	myself->connection = new_connection();
-	myself->name = name;
-	myself->connection->name = xstrdup(name);
+	myself->connection->name = name;
 	read_host_config(&config_tree, name, true);
 
 	if(!get_config_string(lookup_config(&config_tree, "Port"), &myport.tcp)) {
@@ -1087,16 +1086,19 @@ static bool setup_myself(void) {
 
 	/* Open sockets */
 
-	if(!do_detach && getenv("LISTEN_FDS")) {
+	const char *listen_fds = getenv("LISTEN_FDS");
+
+	if(!do_detach && listen_fds) {
 		sockaddr_t sa;
 		socklen_t salen;
 
-		listen_sockets = atoi(getenv("LISTEN_FDS"));
+		listen_sockets = atoi(listen_fds);
 #ifdef HAVE_UNSETENV
 		unsetenv("LISTEN_FDS");
 #endif
 
 		if(listen_sockets > MAXSOCKETS) {
+			listen_sockets = MAXSOCKETS;
 			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}