From: Andreas Henriksson <andreas@fatal.se>
Date: Thu, 18 Sep 2008 17:55:03 +0000 (-0700)
Subject: Allow he in tunnel name
X-Git-Tag: v2.6.27~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f1ae524fbf461c2693d32f57ce468276e0051a8;p=thirdparty%2Fiproute2.git

Allow he in tunnel name

Allows tunnels that could be confused with help command.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
---

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 769e84559..0d9a17f0e 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -196,8 +196,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
 		} else {
 			if (strcmp(*argv, "name") == 0) {
 				NEXT_ARG();
-			}
-			if (matches(*argv, "help") == 0)
+			} else if (matches(*argv, "help") == 0)
 				usage();
 			if (p->name[0])
 				duparg2("name", *argv);