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 */
char installdir[1024] = "";
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);
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");
}
}