X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnames.c;h=138c3cc08cd5bc4ad98ae5f609e51dc158b2bb8f;hb=8c223ae8b641abc6fa1e0c516fc05143dad673ad;hp=688e96d35b31f216b534af7f8eb72d3da9dae779;hpb=a8b52becbbd86a52dc50a6a1b725a80737f2c760;p=meshlink

diff --git a/src/names.c b/src/names.c
index 688e96d3..138c3cc0 100644
--- a/src/names.c
+++ b/src/names.c
@@ -26,6 +26,7 @@
 char *netname = NULL;
 char *confdir = NULL;           /* base configuration directory */
 char *confbase = NULL;          /* base configuration directory for this instance of tinc */
+bool confbase_given;
 char *identname = NULL;         /* program name for syslog */
 char *unixsocketname = NULL;    /* UNIX socket location */
 char *logfilename = NULL;       /* log file location */
@@ -39,8 +40,12 @@ void make_names(void) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof installdir;
+	DWORD len = sizeof installdir;
 #endif
+	confbase_given = confbase;
+
+	if(netname && confbase)
+		logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
 
 	if(netname)
 		xasprintf(&identname, "tinc.%s", netname);
@@ -49,7 +54,7 @@ void make_names(void) {
 
 #ifdef HAVE_MINGW
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
-		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
+		if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
 			confdir = xstrdup(installdir);
 			if(!logfilename)
 				xasprintf(&logfilename, "%s" SLASH "log" SLASH "%s.log", installdir, identname);
@@ -72,7 +77,7 @@ void make_names(void) {
 		xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
 	if(!pidfilename)
-		xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+		xasprintf(&pidfilename, SLASH "tmp" SLASH "%s.pid", identname);
 
 	if(!unixsocketname) {
 		int len = strlen(pidfilename);
@@ -84,13 +89,10 @@ void make_names(void) {
 			strcpy(unixsocketname + len, ".socket");
 	}
 
-	if(netname) {
-		if(!confbase)
+	if(!confbase) {
+		if(netname)
 			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
 		else
-			logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
-	} else {
-		if(!confbase)
 			xasprintf(&confbase, CONFDIR SLASH "tinc");
 	}
 }