projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63f8303
)
Accept Subnets passed with the -o option when StrictSubnets = yes.
author
Guus Sliepen
<guus@tinc-vpn.org>
Wed, 7 Mar 2012 09:40:06 +0000
(10:40 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Wed, 7 Mar 2012 09:40:06 +0000
(10:40 +0100)
src/net_setup.c
patch
|
blob
|
history
diff --git
a/src/net_setup.c
b/src/net_setup.c
index bab50fe4389d36aa1b168543ad356c24635a3e38..2684514392dac017d4b3faeba8f8b4aa510bce69 100644
(file)
--- 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();