summaryrefslogtreecommitdiff
path: root/templates/firewall
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-01-04 16:07:06 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-01-04 16:07:06 -0800
commit7b0fb4e88117bab94d8240c41f37f12a5fbf6a60 (patch)
treee8adbcaed551bffd45e8d827d270fecaed000310 /templates/firewall
parent155f4b58550e17492792d8c30f09ba89ad704743 (diff)
downloadvyatta-cfg-firewall-7b0fb4e88117bab94d8240c41f37f12a5fbf6a60.tar.gz
vyatta-cfg-firewall-7b0fb4e88117bab94d8240c41f37f12a5fbf6a60.zip
Add same restrictions to ipv6-firewall name
See Bug 4156 fix.
Diffstat (limited to 'templates/firewall')
-rw-r--r--templates/firewall/ipv6-name/node.def6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/firewall/ipv6-name/node.def b/templates/firewall/ipv6-name/node.def
index 7a371c8..e9e539c 100644
--- a/templates/firewall/ipv6-name/node.def
+++ b/templates/firewall/ipv6-name/node.def
@@ -3,12 +3,12 @@ priority: 210
type: txt
-syntax:expression: pattern $VAR(@) "^[[:print:]]{1,29}$" ; \
+syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,29}$" ; \
"Firewall name must be 29 characters or less"
syntax:expression: pattern $VAR(@) "^[^-]" ; \
"Firewall rule set name cannot start with \"-\""
-syntax:expression: pattern $VAR(@) "^[^;]*$" ; \
- "Firewall rule set name cannot contain ';'"
+syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \
+ "Firewall rule set name cannot contain shell punctuation"
syntax:expression: ! pattern $VAR(@) "^VZONE" ; \
"Firewall rule set name cannot start with 'VZONE'"