X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf.c;h=a1c0a3df600f80ecbaee2df8807b98396583495f;hb=3d5dd72aa41f162fd5d4d6dd13f46c0fca5a14a9;hp=360053f94b0181fe94ed9f5131df16c0ca75b599;hpb=8fc838f88fad6d6a632f9d4e6906e31931c765e3;p=meshlink diff --git a/src/conf.c b/src/conf.c index 360053f9..a1c0a3df 100644 --- a/src/conf.c +++ b/src/conf.c @@ -297,7 +297,7 @@ bool read_server_config(void) { char *fname; bool x; - xasprintf(&fname, "%s" SLASH "tinc.conf", confbase); + xasprintf(&fname, "%s" SLASH "tinc.conf", mesh->confbase); errno = 0; x = read_config_file(mesh->config, fname); @@ -313,7 +313,7 @@ bool read_host_config(splay_tree_t *config_tree, const char *name) { char *fname; bool x; - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); x = read_config_file(config_tree, fname); free(fname); @@ -322,7 +322,7 @@ bool read_host_config(splay_tree_t *config_tree, const char *name) { bool append_config_file(const char *name, const char *key, const char *value) { char *fname; - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name); FILE *fp = fopen(fname, "a");