X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnames.c;h=47729daceef451deab1d43a3e80c705d7e0590ee;hp=6e5288683dd5c3c44b9a3d7d79e4ebb094960d3b;hb=d4410d0cce40929db9a0ce7042ef962f1867234d;hpb=60fbdb3f2cf0216afb2cfcc2c4128fb5765471ac

diff --git a/src/names.c b/src/names.c
index 6e528868..47729dac 100644
--- a/src/names.c
+++ b/src/names.c
@@ -21,6 +21,7 @@
 #include "system.h"
 
 #include "logger.h"
+#include "names.h"
 #include "xalloc.h"
 
 char *netname = NULL;
@@ -36,7 +37,7 @@ char *program_name = NULL;
 /*
   Set all files and paths according to netname
 */
-void make_names(void) {
+void make_names(bool daemon) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
@@ -56,14 +57,14 @@ void make_names(void) {
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
 			confdir = xstrdup(installdir);
-			if(!logfilename)
-				xasprintf(&logfilename, "%s" SLASH "log" SLASH "%s.log", installdir, identname);
 			if(!confbase) {
 				if(netname)
 					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
+			if(!logfilename)
+				xasprintf(&logfilename, "%s" SLASH "tinc.log", confbase);
 		}
 		RegCloseKey(key);
 	}
@@ -85,7 +86,21 @@ void make_names(void) {
 	if(!pidfilename)
 		xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 #else
-	if(!access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
+	bool fallback = false;
+	if(daemon) {
+		if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
+			fallback = true;
+	} else {
+		char fname[PATH_MAX];
+		snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+		if(access(fname, R_OK)) {
+			snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase);
+			if(!access(fname, R_OK))
+				fallback = true;
+		}
+	}
+
+	if(!fallback) {
 		if(!logfilename)
 			xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
@@ -96,7 +111,8 @@ void make_names(void) {
 			xasprintf(&logfilename, "%s" SLASH "log", confbase);
 
 		if(!pidfilename) {
-			logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
+			if(daemon)
+				logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
 			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 		}
 	}