netfilter-2.6/iptables/trunk: ip6tables.c iptables.c

[pluto]

Author: pluto
Date: Thu Jun 16 23:35:44 2005
New Revision: 6108

Modified:
   netfilter-2.6/iptables/trunk/ip6tables.c
   netfilter-2.6/iptables/trunk/iptables.c
Log:
- chain name should not start with '!' (Yasuyuki Kozakai).


Modified: netfilter-2.6/iptables/trunk/ip6tables.c
==============================================================================
--- netfilter-2.6/iptables/trunk/ip6tables.c	(original)
+++ netfilter-2.6/iptables/trunk/ip6tables.c	Thu Jun 16 23:35:44 2005
@@ -1822,10 +1822,10 @@
 			break;
 
 		case 'N':
-			if (optarg && *optarg == '-')
+			if (optarg && (*optarg == '-' || *optarg == '!'))
 				exit_error(PARAMETER_PROBLEM,
 					   "chain name not allowed to start "
-					   "with `-'\n");
+					   "with `%c'\n", *optarg);
 			if (find_target(optarg, TRY_LOAD))
 				exit_error(PARAMETER_PROBLEM,
 					   "chain name may not clash "

Modified: netfilter-2.6/iptables/trunk/iptables.c
==============================================================================
--- netfilter-2.6/iptables/trunk/iptables.c	(original)
+++ netfilter-2.6/iptables/trunk/iptables.c	Thu Jun 16 23:35:44 2005
@@ -1925,10 +1925,10 @@
 			break;
 
 		case 'N':
-			if (optarg && *optarg == '-')
+			if (optarg && (*optarg == '-' || *optarg == '!'))
 				exit_error(PARAMETER_PROBLEM,
 					   "chain name not allowed to start "
-					   "with `-'\n");
+					   "with `%c'\n", *optarg);
 			if (find_target(optarg, TRY_LOAD))
 				exit_error(PARAMETER_PROBLEM,
 					   "chain name may not clash "