X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnames.c;h=cc72a112318610833163930c56b544f1075be452;hb=23a634becf09ac84c71250474fcb96e23b0ebdf1;hp=1fb0a8f20e087a126d06ab8095afb091e252c579;hpb=94587264bda45cce0295aaa37b59905d4b9843a8;p=tinc

diff --git a/src/names.c b/src/names.c
index 1fb0a8f2..cc72a112 100644
--- a/src/names.c
+++ b/src/names.c
@@ -39,7 +39,7 @@ void make_names(void) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof installdir;
+	DWORD len = sizeof installdir;
 #endif
 
 	if(netname)
@@ -49,7 +49,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);
@@ -66,7 +66,7 @@ void make_names(void) {
 	}
 #endif
 	if(!confdir)
-		confdir = xstrdup(CONFDIR);
+		confdir = xstrdup(CONFDIR SLASH "tinc");
 
 	if(!logfilename)
 		xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
@@ -74,8 +74,15 @@ void make_names(void) {
 	if(!pidfilename)
 		xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
 
-	if(!unixsocketname)
-		xasprintf(&unixsocketname, LOCALSTATEDIR SLASH "run" SLASH "%s.socket", identname);
+	if(!unixsocketname) {
+		int len = strlen(pidfilename);
+		unixsocketname = xmalloc(len + 8);
+		strcpy(unixsocketname, pidfilename);
+		if(len > 4 && !strcmp(pidfilename + len - 4, ".pid"))
+			strcpy(unixsocketname + len - 4, ".socket");
+		else
+			strcpy(unixsocketname + len, ".socket");
+	}
 
 	if(netname) {
 		if(!confbase)