X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=b88f52625374e27505e043ca7fbdfbbf4c7fbbb1;hb=5d68458beed944d29d6da1bf82b311a5f3599119;hp=03186134579636a899407d2f620d93490865009a;hpb=d93d4f9dbd09bc5e53a9b5eeb1cc94939fee32bc;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 03186134..b88f5262 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -45,6 +45,7 @@
 #include "utils.h"
 #include "xalloc.h"
 #include "keys.h"
+#include "sandbox.h"
 
 #ifdef HAVE_MINIUPNPC
 #include "upnp.h"
@@ -183,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);
 		}
 
@@ -230,11 +230,25 @@ char *get_name(void) {
 	return returned_name;
 }
 
-bool setup_myself_reloadable(void) {
-	free(scriptinterpreter);
-	scriptinterpreter = NULL;
+static void read_interpreter(void) {
+	char *interpreter = NULL;
+	get_config_string(lookup_config(&config_tree, "ScriptsInterpreter"), &interpreter);
+
+	if(!interpreter || (sandbox_can(START_PROCESSES, AFTER_SANDBOX) && sandbox_can(USE_NEW_PATHS, AFTER_SANDBOX))) {
+		free(scriptinterpreter);
+		scriptinterpreter = interpreter;
+		return;
+	}
+
+	if(!string_eq(interpreter, scriptinterpreter)) {
+		logger(DEBUG_ALWAYS, LOG_NOTICE, "Not changing ScriptsInterpreter because of sandbox.");
+	}
 
-	get_config_string(lookup_config(&config_tree, "ScriptsInterpreter"), &scriptinterpreter);
+	free(interpreter);
+}
+
+bool setup_myself_reloadable(void) {
+	read_interpreter();
 
 	free(scriptextension);
 
@@ -264,7 +278,12 @@ bool setup_myself_reloadable(void) {
 		} else if(!strcasecmp(proxy, "http")) {
 			proxytype = PROXY_HTTP;
 		} else if(!strcasecmp(proxy, "exec")) {
-			proxytype = PROXY_EXEC;
+			if(sandbox_can(START_PROCESSES, AFTER_SANDBOX)) {
+				proxytype = PROXY_EXEC;
+			} else {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot use exec proxies with current sandbox level.");
+				return false;
+			}
 		} else {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
 			free_string(proxy);
@@ -295,6 +314,10 @@ bool setup_myself_reloadable(void) {
 				return false;
 			}
 
+			if(!sandbox_can(USE_NEW_PATHS, AFTER_SANDBOX)) {
+				logger(DEBUG_ALWAYS, LOG_NOTICE, "Changed exec proxy may fail to work because of sandbox.");
+			}
+
 			proxyhost = xstrdup(space);
 			break;
 
@@ -651,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;
@@ -740,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)) {
@@ -1022,7 +1045,7 @@ static bool setup_myself(void) {
 	devops = os_devops;
 
 	if(get_config_string(lookup_config(&config_tree, "DeviceType"), &type)) {
-		if(!strcasecmp(type, "dummy")) {
+		if(!strcasecmp(type, DEVICE_DUMMY)) {
 			devops = dummy_devops;
 		} else if(!strcasecmp(type, "raw_socket")) {
 			devops = raw_socket_devops;
@@ -1073,6 +1096,7 @@ static bool setup_myself(void) {
 #endif
 
 		if(listen_sockets > MAXSOCKETS) {
+			listen_sockets = MAXSOCKETS;
 			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}