X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=2684514392dac017d4b3faeba8f8b4aa510bce69;hp=299e3729e0cb131555d99238e8b4c2745325c69b;hb=9dea33f5301119dd4423eb962956cf2d246af3f3;hpb=d9ad3d313d96d30ef45cd53367dff9a855a396d4

diff --git a/src/net_setup.c b/src/net_setup.c
index 299e3729..26845143 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -221,7 +221,6 @@ void load_all_subnets(void) {
 	config_t *cfg;
 	subnet_t *s, *s2;
 	node_t *n;
-	bool result;
 
 	xasprintf(&dname, "%s/hosts", confbase);
 	dir = opendir(dname);
@@ -243,10 +242,9 @@ void load_all_subnets(void) {
 
 		xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
 		init_configuration(&config_tree);
-		result = read_config_file(config_tree, fname);
+		read_config_options(config_tree, ent->d_name);
+		read_config_file(config_tree, fname);
 		free(fname);
-		if(!result)
-			continue;
 
 		if(!n) {
 			n = new_node();
@@ -356,6 +354,7 @@ static bool setup_myself(void) {
 	get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
 	get_config_bool(lookup_config(config_tree, "StrictSubnets"), &strictsubnets);
 	get_config_bool(lookup_config(config_tree, "TunnelServer"), &tunnelserver);
+	get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
 	strictsubnets |= tunnelserver;
 
 	if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {