X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Flibmeshlink.c;h=e88b20c46d64dd2c8ea22826869617fbf96a45e4;hb=1564f52f7643c554ec49a3e014bc9b9a8745c856;hp=d6e199fd6c0ad9538af21abb84573cddbfa04ebb;hpb=a3c7e1ce23cd7502f0461354fc6cb2b16f39ed96;p=meshlink

diff --git a/src/libmeshlink.c b/src/libmeshlink.c
index d6e199fd..e88b20c4 100644
--- a/src/libmeshlink.c
+++ b/src/libmeshlink.c
@@ -380,8 +380,7 @@ int check_port(char *name) {
 }
 //tinc_setup() should basically do what cmd_init() from src/tincctl.c does, except it doesn't have to generate a tinc-up script.
 bool tinc_setup(const char* confbaseapi, const char* name) {
-	confbase = confbaseapi;
-	make_names();
+	confbase = xstrdup(confbaseapi);
         xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
         xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 	if(!access(tinc_conf, F_OK)) {
@@ -394,11 +393,6 @@ bool tinc_setup(const char* confbaseapi, const char* name) {
 		return false;
 	}
 
-	if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-		return false;
-	}
-
 	if(mkdir(confbase, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
 		return false;
@@ -437,15 +431,14 @@ return true;
 }
 
 bool tinc_main_thread(void * in) {
+	static bool status = false;
 
-static bool status = false;
-
-/* If nonzero, write log entries to a separate file. */
-bool use_logfile = false;
+	/* If nonzero, write log entries to a separate file. */
+	bool use_logfile = false;
 
-confbase = (char*) in;
+	confbase = (char*) in;
 
-	openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
+	openlogger("tinc", LOGMODE_STDERR);
 
 	init_configuration(&config_tree);
 
@@ -532,7 +525,6 @@ end:
 
 	exit_configuration(&config_tree);
 	free(cmdline_conf);
-	free_names();
 
 	return status;