Remove some more traces of tinc.

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 08467e50f983050d848ae3b06b59a7f9b8acd0ef..aa22c47ff9a67807e2721ba7d7671a3bcbfe7a0e 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -290,47 +290,41 @@ bool read_config_file(splay_tree_t *config_tree, const char *fname) {
        return result;
 }
 
-bool read_server_config(void) {
-       char *fname;
+bool read_server_config(meshlink_handle_t *mesh) {
+       char filename[PATH_MAX];
        bool x;
 
-       xasprintf(&fname, "%s" SLASH "meshlink.conf", mesh->confbase);
+       snprintf(filename, PATH_MAX,"%s" SLASH "meshlink.conf", mesh->confbase);
        errno = 0;
-       x = read_config_file(mesh->config, fname);
+       x = read_config_file(mesh->config, filename);
 
        if(!x && errno)
-               logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
-
-       free(fname);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", filename, strerror(errno));
 
        return x;
 }
 
-bool read_host_config(splay_tree_t *config_tree, const char *name) {
-       char *fname;
+bool read_host_config(meshlink_handle_t *mesh, splay_tree_t *config_tree, const char *name) {
+       char filename[PATH_MAX];
        bool x;
 
-       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-       x = read_config_file(config_tree, fname);
-       free(fname);
+       snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+       x = read_config_file(config_tree, filename);
 
        return x;
 }
 
-bool append_config_file(const char *name, const char *key, const char *value) {
-       char *fname;
-       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+bool append_config_file(meshlink_handle_t *mesh, const char *name, const char *key, const char *value) {
+       char filename[PATH_MAX];
+       snprintf(filename,PATH_MAX, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
 
-       FILE *fp = fopen(fname, "a");
+       FILE *fp = fopen(filename, "a");
 
        if(!fp) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot open config file %s: %s", filename, strerror(errno));
        } else {
-               fprintf(fp, "\n# The following line was automatically added by tinc\n%s = %s\n", key, value);
                fclose(fp);
        }
 
-       free(fname);
-
        return fp != NULL;
 }