From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 7 Mar 2012 09:40:06 +0000 (+0100)
Subject: Accept Subnets passed with the -o option when StrictSubnets = yes.
X-Git-Tag: release-1.0.17~4
X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=commitdiff_plain;h=9dea33f5301119dd4423eb962956cf2d246af3f3;ds=sidebyside

Accept Subnets passed with the -o option when StrictSubnets = yes.
---

diff --git a/src/net_setup.c b/src/net_setup.c
index bab50fe..2684514 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();