diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2011-01-10 16:26:33 -0800 |
|---|---|---|
| committer | Mohit Mehta <mohit@vyatta.com> | 2011-01-10 17:34:56 -0800 |
| commit | 9a3e70c6e2b7e096a3e790fe49646a5d4113fe9a (patch) | |
| tree | 8fb3be5f26d2f02c5c6c0451f8a68c0d3338616f | |
| parent | 32abcc39dbdbc042c716cb477c2e89262aaf0336 (diff) | |
| download | vyatta-zone-9a3e70c6e2b7e096a3e790fe49646a5d4113fe9a.tar.gz vyatta-zone-9a3e70c6e2b7e096a3e790fe49646a5d4113fe9a.zip | |
Fix Bug 6292 iptables chain-name must be reduced to 28 characters max
* change syntax check to limit zone names to 18 chars [10 chars are
reserved for underneath zone chain names] and bump zone cfg-version
to enable config migration
(cherry picked from commit 8c1a5d7f9664fad5488e463d16f7587d7ebb385a)
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | cfg-version/zone-policy@1 | 0 | ||||
| -rw-r--r-- | templates-cfg/zone-policy/zone/node.def | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f9a0f4c..d2a0a11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,9 @@ opdir = $(datadir)/vyatta-op/templates share_perl5dir = $(datarootdir)/perl5/Vyatta bin_sudo_usersdir = $(bindir)/sudo-users +curverdir = $(sysconfdir)/config-migrate/current +curver_DATA = cfg-version/zone-policy@1 + sbin_SCRIPTS = scripts/vyatta-zone.pl sbin_SCRIPTS += scripts/vyatta-zone-ips.pl diff --git a/cfg-version/zone-policy@1 b/cfg-version/zone-policy@1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/cfg-version/zone-policy@1 diff --git a/templates-cfg/zone-policy/zone/node.def b/templates-cfg/zone-policy/zone/node.def index 56c09c2..4845c2f 100644 --- a/templates-cfg/zone-policy/zone/node.def +++ b/templates-cfg/zone-policy/zone/node.def @@ -2,8 +2,8 @@ tag: type: txt help: Zone name -syntax:expression: pattern $VAR(@) "^[[:print:]]{1,20}$" ; - "Zone name must be 20 characters or less" +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,18}$" ; + "Zone name must be 18 characters or less" syntax:expression: pattern $VAR(@) "^[^-]" ; "Zone name cannot start with \"-\"" |