X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=b1529e573115a1cb9528c664a03e8db4f10adc0d;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=c1302d286143c8cb51453677b086e4b8f247bb35;hpb=18237e1f2d9dd5eef4a4e0d746d016bf94a42ad4;p=tinc diff --git a/src/conf.c b/src/conf.c index c1302d28..b1529e57 100644 --- a/src/conf.c +++ b/src/conf.c @@ -385,14 +385,14 @@ bool read_server_config(void) { return x; } -bool read_connection_config(connection_t *c) { +bool read_host_config(splay_tree_t *config_tree, const char *name) { char *fname; bool x; - read_config_options(c->config_tree, c->name); + read_config_options(config_tree, name); - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name); - x = read_config_file(c->config_tree, fname); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + x = read_config_file(config_tree, fname); free(fname); return x; @@ -411,8 +411,7 @@ bool append_config_file(const char *name, const char *key, const char *value) { fclose(fp); } - free(fname); - return fp; + return fp != NULL; }