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

Don't try to mkdir(CONFDIR) if --config is used.

Browse source
This commit is contained in:
Guus Sliepen 2013-09-08 15:03:06 +02:00
parent c25c684a84
commit e11daa2646
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/invitation.c
View file

@ -823,7 +823,7 @@ int cmd_join(int argc, char *argv[]) {
} }
// Make sure confbase exists and is accessible. // Make sure confbase exists and is accessible.
if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) { if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno)); fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
return 1; return 1;
} }

2
src/names.c
View file

@ -26,6 +26,7 @@
char *netname = NULL; char *netname = NULL;
char *confdir = NULL; /* base configuration directory */ char *confdir = NULL; /* base configuration directory */
char *confbase = NULL; /* base configuration directory for this instance of tinc */ char *confbase = NULL; /* base configuration directory for this instance of tinc */
bool confbase_given;
char *identname = NULL; /* program name for syslog */ char *identname = NULL; /* program name for syslog */
char *unixsocketname = NULL; /* UNIX socket location */ char *unixsocketname = NULL; /* UNIX socket location */
char *logfilename = NULL; /* log file location */ char *logfilename = NULL; /* log file location */
@ -41,6 +42,7 @@ void make_names(void) {
char installdir[1024] = ""; char installdir[1024] = "";
DWORD len = sizeof installdir; DWORD len = sizeof installdir;
#endif #endif
confbase_given = confbase;
if(netname && confbase) if(netname && confbase)
logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter..."); logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");

1
src/names.h
View file

@ -23,6 +23,7 @@
extern char *confdir; extern char *confdir;
extern char *confbase; extern char *confbase;
extern bool confbase_given;
extern char *netname; extern char *netname;
extern char *identname; extern char *identname;
extern char *unixsocketname; extern char *unixsocketname;

2
src/tincctl.c
View file

@ -1739,7 +1739,7 @@ static int cmd_init(int argc, char *argv[]) {
return 1; return 1;
} }
if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) { if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno)); fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
return 1; return 1;
} }