From: Patrick McHardy <kaber@trash.net>
Date: Wed, 20 Sep 2006 08:32:25 +0000 (+0000)
Subject: Use negative-list for "weird character in interface" warning instead of warning for... 
X-Git-Tag: v1.3.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d1a297ffdaab3172ab373310175e98daabd6c98;p=thirdparty%2Fiptables.git

Use negative-list for "weird character in interface" warning instead of warning for basically every non-alphanumeric character.
---

diff --git a/ip6tables.c b/ip6tables.c
index ef7e3653..659041f0 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -910,10 +910,10 @@ void parse_interface(const char *arg, char *vianame, unsigned char *mask)
 		memset(mask, 0xFF, vialen + 1);
 		memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1);
 		for (i = 0; vianame[i]; i++) {
-			if (!isalnum(vianame[i]) 
-			    && vianame[i] != '_' 
-			    && vianame[i] != '.') {
-				printf("Warning: wierd character in interface"
+			if (vianame[i] == ':' ||
+			    vianame[i] == '!' ||
+			    vianame[i] == '*') {
+				printf("Warning: weird character in interface"
 				       " `%s' (No aliases, :, ! or *).\n",
 				       vianame);
 				break;
diff --git a/iptables.c b/iptables.c
index 28917cf1..de2fdd6a 100644
--- a/iptables.c
+++ b/iptables.c
@@ -882,9 +882,9 @@ void parse_interface(const char *arg, char *vianame, unsigned char *mask)
 		memset(mask, 0xFF, vialen + 1);
 		memset(mask + vialen + 1, 0, IFNAMSIZ - vialen - 1);
 		for (i = 0; vianame[i]; i++) {
-			if (!isalnum(vianame[i]) 
-			    && vianame[i] != '_' 
-			    && vianame[i] != '.') {
+			if (vianame[i] == ':' ||
+			    vianame[i] == '!' ||
+			    vianame[i] == '*') {
 				printf("Warning: wierd character in interface"
 				       " `%s' (No aliases, :, ! or *).\n",
 				       vianame);