diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2011-01-10 16:23:06 -0800 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-11-04 09:53:46 -0700 |
| commit | 3342e09eb9cea4a92a1d55c79f20e41c387f2319 (patch) | |
| tree | d7d75940db9ccbcf391a84b83b1935c70aeefae2 | |
| parent | e673d235e9920d4431a7fdfbca5aa0bac7730d6b (diff) | |
| download | vyatta-cfg-firewall-3342e09eb9cea4a92a1d55c79f20e41c387f2319.tar.gz vyatta-cfg-firewall-3342e09eb9cea4a92a1d55c79f20e41c387f2319.zip | |
Fix Bug 6292 iptables chain-name must be reduced to 28 characters max
* change syntax check to limit firewall ruleset names to 28 chars and
bump firewall cfg-version to enable config migration
(cherry picked from commit a0e5b2107d6073a103e0f0c04cc8656f8dc3816b)
(cherry picked from commit 435bf038f32a968424030da43b4a85ec50e02767)
| -rw-r--r-- | templates/firewall/ipv6-modify/node.def | 4 | ||||
| -rw-r--r-- | templates/firewall/ipv6-name/node.def | 4 | ||||
| -rw-r--r-- | templates/firewall/modify/node.def | 4 | ||||
| -rw-r--r-- | templates/firewall/name/node.def | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/templates/firewall/ipv6-modify/node.def b/templates/firewall/ipv6-modify/node.def index 9a4b487..035ddd1 100644 --- a/templates/firewall/ipv6-modify/node.def +++ b/templates/firewall/ipv6-modify/node.def @@ -3,8 +3,8 @@ priority: 210 type: txt -syntax:expression: pattern $VAR(@) "^[[:print:]]{1,29}$" ; \ - "Firewall name must be 29 characters or less" +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,28}$" ; \ + "Firewall name must be 28 characters or less" syntax:expression: pattern $VAR(@) "^[^-]" ; \ "Firewall rule set name cannot start with \"-\"" syntax:expression: pattern $VAR(@) "^[^;]*$" ; \ diff --git a/templates/firewall/ipv6-name/node.def b/templates/firewall/ipv6-name/node.def index 3a151d9..0eb53f7 100644 --- a/templates/firewall/ipv6-name/node.def +++ b/templates/firewall/ipv6-name/node.def @@ -3,8 +3,8 @@ priority: 210 type: txt -syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,29}$" ; \ - "Firewall name must be 29 characters or less" +syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,28}$" ; \ + "Firewall name must be 28 characters or less" syntax:expression: pattern $VAR(@) "^[^-]" ; \ "Firewall rule set name cannot start with \"-\"" syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ diff --git a/templates/firewall/modify/node.def b/templates/firewall/modify/node.def index becde92..e1f82f3 100644 --- a/templates/firewall/modify/node.def +++ b/templates/firewall/modify/node.def @@ -3,8 +3,8 @@ priority: 210 type: txt -syntax:expression: pattern $VAR(@) "^[[:print:]]{1,29}$" ; \ - "Firewall name must be 29 characters or less" +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,28}$" ; \ + "Firewall name must be 28 characters or less" syntax:expression: pattern $VAR(@) "^[^-]" ; \ "Firewall rule set name cannot start with \"-\"" syntax:expression: pattern $VAR(@) "^[^;]*$" ; \ diff --git a/templates/firewall/name/node.def b/templates/firewall/name/node.def index 2f2d05b..7e9bc44 100644 --- a/templates/firewall/name/node.def +++ b/templates/firewall/name/node.def @@ -3,8 +3,8 @@ priority: 210 type: txt -syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,29}$" ; \ - "Firewall name must be 29 characters or less" +syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,28}$" ; \ + "Firewall name must be 28 characters or less" syntax:expression: pattern $VAR(@) "^[^-]" ; \ "Firewall rule set name cannot start with \"-\"" syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ |