X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=d1df07beefbd803b0b53122aab0088bd1e485dd7;hb=a1bd3a291379492c8ffecd53792065dc20a28c79;hp=b2e6e82172e2a08c49f270699ff5980d0361a100;hpb=a7556a9d2c943a6317d2dab66d9f742997f0d47a;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index b2e6e821..d1df07be 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -138,6 +138,12 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
+	if(!netname) {
+		netname = getenv("NETNAME");
+		if(netname)
+			netname = xstrdup(netname);
+	}
+
 	return true;
 }
 
@@ -516,7 +522,7 @@ static bool remove_service(void) {
 }
 #endif
 
-int main(int argc, char *argv[], char *envp[]) {
+int main(int argc, char *argv[]) {
 	int fd;
 	int result;
 	char host[128];
@@ -577,7 +583,7 @@ int main(int argc, char *argv[], char *envp[]) {
 #endif
 		if (slash++) {
 			c = xmalloc((slash - argv[0]) + sizeof("tincd"));
-			sprintf(c, "%.*stincd", slash - argv[0], argv[0]);
+			sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
 		}
 		else
 			c = "tincd";
@@ -586,7 +592,7 @@ int main(int argc, char *argv[], char *envp[]) {
 			if (i != optind && strcmp(argv[i], "--") != 0)
 				argv[j++] = argv[i];
 		argv[j] = NULL;
-		execve(c, argv, envp);
+		execvp(c, argv);
 		fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
 		return 1;
 	}