From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 21 Jul 2012 13:15:04 +0000 (+0200)
Subject: Have tincd and tincctl use the same method of determining netname.
X-Git-Tag: release-1.1pre3~88
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=33521eabd4501b4add35468618453ac4f76311f3

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

diff --git a/src/tincctl.c b/src/tincctl.c
index a3688eca..f547639a 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -187,11 +187,15 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
-	if(!netname) {
-		netname = getenv("NETNAME");
-		if(netname)
-			netname = xstrdup(netname);
-	}
+        if(!netname && (netname = getenv("NETNAME")))
+                netname = xstrdup(netname);
+
+        /* netname "." is special: a "top-level name" */
+
+        if(!strcmp(netname, ".")) {
+                free(netname);
+                netname = NULL;
+        }
 
 	return true;
 }
diff --git a/src/tincd.c b/src/tincd.c
index 9f65bbea..85aee39f 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -177,9 +177,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 'n':				/* net name given */
-				/* netname "." is special: a "top-level name" */
-				netname = strcmp(optarg, ".") != 0 ?
-						xstrdup(optarg) : NULL;
+				netname = xstrdup(optarg);
 				break;
 
 			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;
 }