X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=c3cae5dbd89f2055f68064516de6a2440aeec4ee;hp=b6a6c29cd39384d14df10f437a4acd3694046801;hb=5046dbd40c7cc572b84f28412723934bf392cb0d;hpb=110ca1958af2465e383b4ca20b67fd0e780f3fb5

diff --git a/src/tincd.c b/src/tincd.c
index b6a6c29c..c3cae5db 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -97,7 +97,7 @@ char *pidfilename = NULL;			/* pid file location */
 char *logfilename = NULL;			/* log file location */
 char **g_argv;					/* a copy of the cmdline arguments */
 
-static int status;
+static int status = 1;
 
 static struct option const long_options[] = {
 	{"config", required_argument, NULL, 'c'},
@@ -438,14 +438,14 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
-			if(!logfilename)
-				xasprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
 					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
+			if(!logfilename)
+				xasprintf(&logfilename, "%s/tinc.log", confbase);
 		}
 		RegCloseKey(key);
 		if(*installdir)