j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix warning "Both netname and configuration directory given" on Windows.

Browse source
This commit is contained in:
Guus Sliepen 2013-07-15 14:48:43 +02:00
parent 633b7cbb45
commit 918067f117
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/names.c
View file

@ -42,6 +42,9 @@ void make_names(void) {
DWORD len = sizeof installdir; DWORD len = sizeof installdir;
#endif #endif
if(netname && confbase)
logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
if(netname) if(netname)
xasprintf(&identname, "tinc.%s", netname); xasprintf(&identname, "tinc.%s", netname);
else else
@ -84,13 +87,10 @@ void make_names(void) {
strcpy(unixsocketname + len, ".socket"); strcpy(unixsocketname + len, ".socket");
} }
if(netname) { if(!confbase) {
if(!confbase) if(netname)
xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname); xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
else else
logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
} else {
if(!confbase)
xasprintf(&confbase, CONFDIR SLASH "tinc"); xasprintf(&confbase, CONFDIR SLASH "tinc");
} }
} }