X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=dd0bbcc220677d97bfbc1f83cacb677e54d18ed9;hp=00d8eb903d27fcddca01741105dea06deb769729;hb=a717b9bcfbe811787fd6718fb3f8fb3f272bcfb9;hpb=d74b81b61e87c66d364a8590a48d87773ad2652c

diff --git a/src/tincctl.c b/src/tincctl.c
index 00d8eb90..dd0bbcc2 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -54,14 +54,15 @@ static bool show_help = false;
 static bool show_version = false;
 
 static char *name = NULL;
-static char *identname = NULL;				/* program name for syslog */
-static char *pidfilename = NULL;			/* pid file location */
+static char *identname = NULL;          /* program name for syslog */
+static char *pidfilename = NULL;        /* pid file location */
 static char *confdir = NULL;
-static char controlcookie[1024];
+static char controlcookie[1025];
 char *netname = NULL;
 char *confbase = NULL;
 static char *tinc_conf = NULL;
 static char *hosts_dir = NULL;
+struct timeval now;
 
 // Horrible global variables...
 static int pid = 0;
@@ -134,11 +135,11 @@ static void usage(bool status) {
 				"  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
 				"  generate-ecdsa-keys        Generate a new ECDSA public/private keypair.\n"
 				"  dump                       Dump a list of one of the following things:\n"
-				"    nodes                    - all known nodes in the VPN\n"
+				"    [reachable] nodes        - all known nodes in the VPN\n"
 				"    edges                    - all known connections in the VPN\n"
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
-				"    graph                    - graph of the VPN in dotty format\n"
+				"    [di]graph                - graph of the VPN in dotty format\n"
 				"  info NODE|SUBNET|ADDRESS   Give information about a particular NODE, SUBNET or ADDRESS.\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
@@ -163,34 +164,34 @@ static bool parse_options(int argc, char **argv) {
 
 	while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
 		switch (r) {
-			case 0:				/* long option */
+			case 0:   /* long option */
 				break;
 
-			case 'c':				/* config file */
+			case 'c': /* config file */
 				confbase = xstrdup(optarg);
 				break;
 
-			case 'n':				/* net name given */
+			case 'n': /* net name given */
 				netname = xstrdup(optarg);
 				break;
 
-			case 1:					/* show help */
+			case 1:   /* show help */
 				show_help = true;
 				break;
 
-			case 2:					/* show version */
+			case 2:   /* show version */
 				show_version = true;
 				break;
 
-			case 5:					/* open control socket here */
+			case 5:   /* open control socket here */
 				pidfilename = xstrdup(optarg);
 				break;
 
-			case 6:
+			case 6:   /* force */
 				force = true;
 				break;
 
-			case '?':
+			case '?': /* wrong options */
 				usage(true);
 				return false;
 
@@ -199,15 +200,15 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
-        if(!netname && (netname = getenv("NETNAME")))
-                netname = xstrdup(netname);
+	if(!netname && (netname = getenv("NETNAME")))
+		netname = xstrdup(netname);
 
-        /* netname "." is special: a "top-level name" */
+	/* netname "." is special: a "top-level name" */
 
-        if(netname && (!*netname || !strcmp(netname, "."))) {
-                free(netname);
-                netname = NULL;
-        }
+	if(netname && (!*netname || !strcmp(netname, "."))) {
+		free(netname);
+		netname = NULL;
+	}
 
 	if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
 		fprintf(stderr, "Invalid character in netname!\n");
@@ -217,6 +218,83 @@ static bool parse_options(int argc, char **argv) {
 	return true;
 }
 
+static void disable_old_keys(const char *filename, const char *what) {
+	char tmpfile[PATH_MAX] = "";
+	char buf[1024];
+	bool disabled = false;
+	bool block = false;
+	bool error = false;
+	FILE *r, *w;
+
+	r = fopen(filename, "r");
+	if(!r)
+		return;
+
+	snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename);
+
+	w = fopen(tmpfile, "w");
+
+	while(fgets(buf, sizeof buf, r)) {
+		if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
+			if((strstr(buf, " EC ") && strstr(what, "ECDSA")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+				disabled = true;
+				block = true;
+			}
+		}
+
+		bool ecdsapubkey = !strncasecmp(buf, "ECDSAPublicKey", 14) && strchr(" \t=", buf[14]) && strstr(what, "ECDSA");
+
+		if(ecdsapubkey)
+			disabled = true;
+
+		if(w) {
+			if(block || ecdsapubkey)
+				fputc('#', w);
+			if(fputs(buf, w) < 0) {
+				error = true;
+				break;
+			}
+		}
+
+		if(block && !strncmp(buf, "-----END ", 9))
+			block = false;
+	}
+
+	if(w)
+		if(fclose(w) < 0)
+			error = true;
+	if(ferror(r) || fclose(r) < 0)
+		error = true;
+
+	if(disabled) {
+		if(!w || error) {
+			fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
+			if(w)
+				unlink(tmpfile);
+			return;
+		}
+
+#ifdef HAVE_MINGW
+		// We cannot atomically replace files on Windows.
+		char bakfile[PATH_MAX] = "";
+		snprintf(bakfile, sizeof bakfile, "%s.bak", filename);
+		if(rename(filename, bakfile) || rename(tmpfile, filename)) {
+			rename(bakfile, filename);
+#else
+		if(rename(tmpfile, filename)) {
+#endif
+			fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
+		} else  {
+#ifdef HAVE_MINGW
+			unlink(bakfile);
+#endif
+			fprintf(stderr, "Warning: old key(s) found and disabled.\n");
+		}
+	}
+
+	unlink(tmpfile);
+}
+
 static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask) {
 	FILE *r;
 	char *directory;
@@ -255,7 +333,9 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 		filename = buf2;
 	}
 
-	umask(0077);				/* Disallow everything for group and other */
+	umask(0077); /* Disallow everything for group and other */
+
+	disable_old_keys(filename, what);
 
 	/* Open it first to keep the inode busy */
 
@@ -276,7 +356,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 static bool ecdsa_keygen(bool ask) {
 	ecdsa_t key;
 	FILE *f;
-	char *filename;
+	char *pubname, *privname;
 
 	fprintf(stderr, "Generating ECDSA keypair:\n");
 
@@ -286,44 +366,38 @@ static bool ecdsa_keygen(bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
-	f = ask_and_open(filename, "private ECDSA key", "a", ask);
+	xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
+	f = ask_and_open(privname, "private ECDSA key", "a", ask);
+	free(privname);
 
 	if(!f)
 		return false;
-  
+
 #ifdef HAVE_FCHMOD
 	/* Make it unreadable for others. */
 	fchmod(fileno(f), 0600);
 #endif
-		
-	if(ftell(f))
-		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
 
 	ecdsa_write_pem_private_key(&key, f);
 
 	fclose(f);
-	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
+		xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
 
-	f = ask_and_open(filename, "public ECDSA key", "a", ask);
+	f = ask_and_open(pubname, "public ECDSA key", "a", ask);
+	free(pubname);
 
 	if(!f)
 		return false;
 
-	if(ftell(f))
-		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
-
 	char *pubkey = ecdsa_get_base64_public_key(&key);
 	fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
 	free(pubkey);
 
 	fclose(f);
-	free(filename);
 
 	return true;
 }
@@ -335,7 +409,7 @@ static bool ecdsa_keygen(bool ask) {
 static bool rsa_keygen(int bits, bool ask) {
 	rsa_t key;
 	FILE *f;
-	char *filename;
+	char *pubname, *privname;
 
 	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
@@ -345,42 +419,36 @@ static bool rsa_keygen(int bits, bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-	f = ask_and_open(filename, "private RSA key", "a", ask);
+	xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
+	f = ask_and_open(privname, "private RSA key", "a", ask);
+	free(privname);
 
 	if(!f)
 		return false;
-  
+
 #ifdef HAVE_FCHMOD
 	/* Make it unreadable for others. */
 	fchmod(fileno(f), 0600);
 #endif
-		
-	if(ftell(f))
-		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
 
 	rsa_write_pem_private_key(&key, f);
 
 	fclose(f);
-	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
+		xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
 
-	f = ask_and_open(filename, "public RSA key", "a", ask);
+	f = ask_and_open(pubname, "public RSA key", "a", ask);
+	free(pubname);
 
 	if(!f)
 		return false;
 
-	if(ftell(f))
-		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
-
 	rsa_write_pem_public_key(&key, f);
 
 	fclose(f);
-	free(filename);
 
 	return true;
 }
@@ -512,7 +580,7 @@ bool sendline(int fd, char *format, ...) {
 		blen -= result;
 	}
 
-	return true;	
+	return true;
 }
 
 static void pcap(int fd, FILE *out, int snaplen) {
@@ -620,8 +688,19 @@ static bool remove_service(void) {
 #endif
 
 static bool connect_tincd(bool verbose) {
-	if(fd >= 0)
-		return true;
+	if(fd >= 0) {
+		fd_set r;
+		FD_ZERO(&r);
+		FD_SET(fd, &r);
+		struct timeval tv = {0, 0};
+		if(select(fd + 1, &r, NULL, NULL, &tv)) {
+			fprintf(stderr, "Previous connection to tincd lost, reconnecting.\n");
+			close(fd);
+			fd = -1;
+		} else {
+			return true;
+		}
+	}
 
 	FILE *f = fopen(pidfilename, "r");
 	if(!f) {
@@ -630,8 +709,8 @@ static bool connect_tincd(bool verbose) {
 		return false;
 	}
 
-	char host[128];
-	char port[128];
+	char host[129];
+	char port[129];
 
 	if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
 		if(verbose)
@@ -684,6 +763,8 @@ static bool connect_tincd(bool verbose) {
 	if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
 		if(verbose)
 			fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno));
+		close(fd);
+		fd = -1;
 		return false;
 	}
 
@@ -695,14 +776,18 @@ static bool connect_tincd(bool verbose) {
 	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %s %d", &code, data, &version) != 3 || code != 0) {
 		if(verbose)
 			fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno));
+		close(fd);
+		fd = -1;
 		return false;
 	}
 
 	sendline(fd, "%d ^%s %d", ID, controlcookie, TINC_CTL_VERSION_CURRENT);
-	
+
 	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &version, &pid) != 3 || code != 4 || version != TINC_CTL_VERSION_CURRENT) {
 		if(verbose)
 			fprintf(stderr, "Could not fully establish control socket connection\n");
+		close(fd);
+		fd = -1;
 		return false;
 	}
 
@@ -733,9 +818,10 @@ static int cmd_start(int argc, char *argv[]) {
 		c = "tincd";
 
 	int nargc = 0;
-	char **nargv = xmalloc_and_zero((orig_argc + argc) * sizeof *nargv);
+	char **nargv = xmalloc_and_zero((optind + argc) * sizeof *nargv);
 
-	for(int i = 0; i < orig_argc; i++)
+	nargv[nargc++] = c;
+	for(int i = 1; i < optind; i++)
 		nargv[nargc++] = orig_argv[i];
 	for(int i = 1; i < argc; i++)
 		nargv[nargc++] = argv[i];
@@ -748,12 +834,15 @@ static int cmd_start(int argc, char *argv[]) {
 	pid_t pid = fork();
 	if(pid == -1) {
 		fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+		free(nargv);
 		return 1;
 	}
 
 	if(!pid)
 		exit(execvp(c, nargv));
-	
+
+	free(nargv);
+
 	int status = -1;
 	if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
 		fprintf(stderr, "Error starting %s\n", c);
@@ -768,9 +857,13 @@ static int cmd_stop(int argc, char *argv[]) {
 #ifndef HAVE_MINGW
 	if(!connect_tincd(true)) {
 		if(pid) {
-			if(kill(pid, SIGTERM)) 
+			if(kill(pid, SIGTERM)) {
+				fprintf(stderr, "Could not send TERM signal to process with PID %u: %s\n", pid, strerror(errno));
 				return 1;
+			}
+
 			fprintf(stderr, "Sent TERM signal to process with PID %u.\n", pid);
+			waitpid(pid, NULL, 0);
 			return 0;
 		}
 
@@ -782,6 +875,12 @@ static int cmd_stop(int argc, char *argv[]) {
 		fprintf(stderr, "Could not stop tinc daemon.\n");
 		return 1;
 	}
+
+	// Wait for tincd to close the connection...
+	fd_set r;
+	FD_ZERO(&r);
+	FD_SET(fd, &r);
+	select(fd + 1, &r, NULL, NULL, NULL);
 #else
 	if(!remove_service())
 		return 1;
@@ -813,6 +912,19 @@ static int cmd_reload(int argc, char *argv[]) {
 }
 
 static int cmd_dump(int argc, char *argv[]) {
+	bool only_reachable = false;
+
+	if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
+		if(strcasecmp(argv[2], "nodes")) {
+			fprintf(stderr, "`reachable' only supported for nodes.\n");
+			usage(true);
+			return 1;
+		}
+		only_reachable = true;
+		argv++;
+		argc--;
+	}
+
 	if(argc != 2) {
 		fprintf(stderr, "Invalid number of arguments.\n");
 		usage(true);
@@ -822,7 +934,7 @@ static int cmd_dump(int argc, char *argv[]) {
 	if(!connect_tincd(true))
 		return 1;
 
-	bool do_graph = false;
+	int do_graph = 0;
 
 	if(!strcasecmp(argv[1], "nodes"))
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -835,19 +947,25 @@ static int cmd_dump(int argc, char *argv[]) {
 	else if(!strcasecmp(argv[1], "graph")) {
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
-		do_graph = true;
+		do_graph = 1;
+	} else if(!strcasecmp(argv[1], "digraph")) {
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_EDGES);
+		do_graph = 2;
 	} else {
 		fprintf(stderr, "Unknown dump type '%s'.\n", argv[1]);
 		usage(true);
 		return 1;
 	}
 
-	if(do_graph)
+	if(do_graph == 1)
+		printf("graph {\n");
+	else if(do_graph == 2)
 		printf("digraph {\n");
 
 	while(recvline(fd, line, sizeof line)) {
 		char node1[4096], node2[4096];
-		int n = sscanf(line, "%d %d %s to %s", &code, &req, node1, node2);
+		int n = sscanf(line, "%d %d %s %s", &code, &req, node1, node2);
 		if(n == 2) {
 			if(do_graph && req == REQ_DUMP_NODES)
 				continue;
@@ -860,13 +978,90 @@ static int cmd_dump(int argc, char *argv[]) {
 		if(n < 2)
 			break;
 
-		if(!do_graph)
-			printf("%s\n", line + 5);
-		else {
-			if(req == REQ_DUMP_NODES)
-				printf(" %s [label = \"%s\"];\n", node1, node1);
-			else
-				printf(" %s -> %s;\n", node1, node2);
+		char node[4096];
+		char from[4096];
+		char to[4096];
+		char subnet[4096];
+		char host[4096];
+		char port[4096];
+		char via[4096];
+		char nexthop[4096];
+		int cipher, digest, maclength, compression, distance, socket, weight;
+		short int pmtu, minmtu, maxmtu;
+		unsigned int options, status_int;
+		node_status_t status;
+		long int last_state_change;
+
+		switch(req) {
+			case REQ_DUMP_NODES: {
+				int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+				if(n != 16) {
+					fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
+					return 1;
+				}
+
+				memcpy(&status, &status_int, sizeof status);
+
+				if(do_graph) {
+					const char *color = "black";
+					if(!strcmp(host, "MYSELF"))
+						color = "green";
+					else if(!status.reachable)
+						color = "red";
+					else if(strcmp(via, node))
+						color = "orange";
+					else if(!status.validkey)
+						color = "black";
+					else if(minmtu > 0)
+						color = "green";
+					printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
+				} else {
+					if(only_reachable && !status.reachable)
+						continue;
+					printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
+							node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+				}
+			} break;
+
+			case REQ_DUMP_EDGES: {
+				int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
+				if(n != 6) {
+					fprintf(stderr, "Unable to parse edge dump from tincd.\n");
+					return 1;
+				}
+
+				if(do_graph) {
+					float w = 1 + 65536.0 / weight;
+					if(do_graph == 1 && strcmp(node1, node2) > 0)
+						printf(" %s -- %s [w = %f, weight = %f];\n", node1, node2, w, w);
+					else if(do_graph == 2)
+						printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
+				} else {
+					printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
+				}
+			} break;
+
+			case REQ_DUMP_SUBNETS: {
+				int n = sscanf(line, "%*d %*d %s %s", subnet, node);
+				if(n != 2) {
+					fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
+					return 1;
+				}
+				printf("%s owner %s\n", strip_weight(subnet), node);
+			} break;
+
+			case REQ_DUMP_CONNECTIONS: {
+				int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status_int);
+				if(n != 6) {
+					fprintf(stderr, "Unable to parse connection dump from tincd.\n");
+					return 1;
+				}
+				printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status_int);
+			} break;
+
+			default:
+				fprintf(stderr, "Unable to parse dump from tincd.\n");
+				return 1;
 		}
 	}
 
@@ -1056,6 +1251,7 @@ static struct {
 } const variables[] = {
 	/* Server configuration */
 	{"AddressFamily", VAR_SERVER},
+	{"AutoConnect", VAR_SERVER},
 	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
 	{"BindToInterface", VAR_SERVER},
 	{"Broadcast", VAR_SERVER},
@@ -1067,7 +1263,7 @@ static struct {
 	{"ECDSAPrivateKeyFile", VAR_SERVER},
 	{"ExperimentalProtocol", VAR_SERVER},
 	{"Forwarding", VAR_SERVER},
-	{"GraphDumpFile", VAR_SERVER},
+	{"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
 	{"Hostnames", VAR_SERVER},
 	{"IffOneQueue", VAR_SERVER},
 	{"Interface", VAR_SERVER},
@@ -1086,6 +1282,8 @@ static struct {
 	{"ProcessPriority", VAR_SERVER},
 	{"Proxy", VAR_SERVER},
 	{"ReplayWindow", VAR_SERVER},
+	{"ScriptsExtension", VAR_SERVER},
+	{"ScriptsInterpreter", VAR_SERVER},
 	{"StrictSubnets", VAR_SERVER},
 	{"TunnelServer", VAR_SERVER},
 	{"UDPRcvBuf", VAR_SERVER},
@@ -1148,14 +1346,14 @@ static int cmd_config(int argc, char *argv[]) {
 	char *value;
 	int len;
 
-        len = strcspn(line, "\t =");
-        value = line + len;
-        value += strspn(value, "\t ");
-        if(*value == '=') {
-                value++;
-                value += strspn(value, "\t ");
-        }
-        line[len] = '\0';
+	len = strcspn(line, "\t =");
+	value = line + len;
+	value += strspn(value, "\t ");
+	if(*value == '=') {
+		value++;
+		value += strspn(value, "\t ");
+	}
+	line[len] = '\0';
 	variable = strchr(line, '.');
 	if(variable) {
 		node = line;
@@ -1766,7 +1964,7 @@ static char *complete_command(const char *text, int state) {
 }
 
 static char *complete_dump(const char *text, int state) {
-	const char *matches[] = {"nodes", "edges", "subnets", "connections", "graph", NULL};
+	const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
 	static int i;
 
 	if(!state)
@@ -1889,7 +2087,6 @@ static int cmd_shell(int argc, char *argv[]) {
 	char *line = NULL;
 	int maxargs = argc + 16;
 	char **nargv = xmalloc(maxargs * sizeof *nargv);
-	optind = argc;
 
 	for(int i = 0; i < argc; i++)
 		nargv[i] = argv[i];
@@ -1975,6 +2172,8 @@ static int cmd_shell(int argc, char *argv[]) {
 		}
 	}
 
+	free(nargv);
+
 	if(tty)
 		printf("\n");
 	return result;
@@ -1988,7 +2187,7 @@ int main(int argc, char *argv[]) {
 
 	if(!parse_options(argc, argv))
 		return 1;
-	
+
 	make_names();
 
 	if(show_version) {