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

Have tincd and tincctl use the same method of determining netname.

Browse source
This commit is contained in:
Guus Sliepen 2012-07-21 15:15:04 +02:00
parent 1d322d2eda
commit 33521eabd4
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tincctl.c
View file

@ -187,11 +187,15 @@ static bool parse_options(int argc, char **argv) {
} }
} }
if(!netname) { if(!netname && (netname = getenv("NETNAME")))
netname = getenv("NETNAME"); netname = xstrdup(netname);
if(netname)
netname = xstrdup(netname); /* netname "." is special: a "top-level name" */
}
if(!strcmp(netname, ".")) {
free(netname);
netname = NULL;
}
return true; return true;
} }

14
src/tincd.c
View file

@ -177,9 +177,7 @@ static bool parse_options(int argc, char **argv) {
break; break;
case 'n': /* net name given */ case 'n': /* net name given */
/* netname "." is special: a "top-level name" */ netname = xstrdup(optarg);
netname = strcmp(optarg, ".") != 0 ?
xstrdup(optarg) : NULL;
break; break;
case 'o': /* option */ case 'o': /* option */
@ -228,6 +226,16 @@ static bool parse_options(int argc, char **argv) {
} }
} }
if(!netname && (netname = getenv("NETNAME")))
netname = xstrdup(netname);
/* netname "." is special: a "top-level name" */
if(!strcmp(netname, ".")) {
free(netname);
netname = NULL;
}
return true; return true;
} }