X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=b1529e573115a1cb9528c664a03e8db4f10adc0d;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=d50dc52554b1fd474960e70b36a224946b6aa41d;hpb=4591e96c76914795aaae317c067f16abc22fb2e0;p=tinc

diff --git a/src/conf.c b/src/conf.c
index d50dc525..b1529e57 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -373,7 +373,7 @@ bool read_server_config(void) {
 
 	read_config_options(config_tree, NULL);
 
-	xasprintf(&fname, "%s/tinc.conf", confbase);
+	xasprintf(&fname, "%s" SLASH "tinc.conf", confbase);
 	x = read_config_file(config_tree, fname);
 
 	if(!x) {				/* System error: complain */
@@ -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/hosts/%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;
@@ -400,7 +400,7 @@ bool read_connection_config(connection_t *c) {
 
 bool append_config_file(const char *name, const char *key, const char *value) {
 	char *fname;
-	xasprintf(&fname, "%s/hosts/%s", confbase, name);
+	xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 
 	FILE *fp = fopen(fname, "a");
 
@@ -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;
 }