[netfilter-cvslog] r6670 - trunk/iptables

kaber at netfilter.org kaber at netfilter.org
Wed Sep 20 10:32:25 CEST 2006


Author: kaber at netfilter.org
Date: 2006-09-20 10:32:25 +0200 (Wed, 20 Sep 2006)
New Revision: 6670

Modified:
   trunk/iptables/ip6tables.c
   trunk/iptables/iptables.c
Log:
Use negative-list for "weird character in interface" warning instead of warning for basically every non-alphanumeric character.


Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2006-09-14 11:06:32 UTC (rev 6669)
+++ trunk/iptables/ip6tables.c	2006-09-20 08:32:25 UTC (rev 6670)
@@ -910,10 +910,10 @@
 		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;

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2006-09-14 11:06:32 UTC (rev 6669)
+++ trunk/iptables/iptables.c	2006-09-20 08:32:25 UTC (rev 6670)
@@ -882,9 +882,9 @@
 		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);




More information about the netfilter-cvslog mailing list