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

Don't try to mkdir(CONFDIR) on Windows when there is a registry key for tinc.

Browse source
This commit is contained in:
Guus Sliepen 2012-07-21 15:58:16 +02:00
parent ed8ce60845
commit 09a8ff649c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/tincctl.c
View file

@ -47,6 +47,7 @@ static bool show_version = false;
static char *name = NULL; static char *name = NULL;
static char *identname = NULL; /* program name for syslog */ static char *identname = NULL; /* program name for syslog */
static char *pidfilename = NULL; /* pid file location */ static char *pidfilename = NULL; /* pid file location */
static char *confdir = NULL;
static char controlcookie[1024]; static char controlcookie[1024];
char *netname = NULL; char *netname = NULL;
char *confbase = NULL; char *confbase = NULL;
@ -400,6 +401,7 @@ static void make_names(void) {
if(!*installdir) { if(!*installdir) {
#endif #endif
confdir = xstrdup(CONFDIR);
if(!pidfilename) if(!pidfilename)
xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname); xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname);
@ -415,7 +417,8 @@ static void make_names(void) {
} }
#ifdef HAVE_MINGW #ifdef HAVE_MINGW
} } else
confdir = xstrdup(installdir);
#endif #endif
xasprintf(&tinc_conf, "%s/tinc.conf", confbase); xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
@ -1348,7 +1351,7 @@ static int cmd_init(int argc, char *argv[]) {
return 1; return 1;
} }
if(mkdir(CONFDIR, 0755) && errno != EEXIST) { if(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;
} }