projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.17.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
bab50fe
..
2684514
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;
config_t *cfg;
subnet_t *s, *s2;
node_t *n;
- bool result;
xasprintf(&dname, "%s/hosts", confbase);
dir = opendir(dname);
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);
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);
free(fname);
- if(!result)
- continue;
if(!n) {
n = new_node();
if(!n) {
n = new_node();