#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
- long len = sizeof installdir;
+ DWORD len = sizeof installdir;
#endif
+ if(netname && confbase)
+ logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
+
if(netname)
xasprintf(&identname, "tinc.%s", netname);
else
#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);
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");
}
}