diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-06-02 21:05:15 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-06-02 21:05:15 -0700 |
| commit | 8a08387990b286a67125317e500bc81a3838b454 (patch) | |
| tree | 0b2e37d5c6f2572347a3a77c58e2942605d40523 /templates/firewall/name | |
| parent | 892a2b9d6fb1274fbc2dd9489d154c516ffa074f (diff) | |
| download | vyatta-cfg-firewall-8a08387990b286a67125317e500bc81a3838b454.tar.gz vyatta-cfg-firewall-8a08387990b286a67125317e500bc81a3838b454.zip | |
Make firewall syntax checks use the vyatta-util library
Diffstat (limited to 'templates/firewall/name')
| -rw-r--r-- | templates/firewall/name/node.tag/rule/node.tag/protocol/node.def | 2 | ||||
| -rw-r--r-- | templates/firewall/name/node.tag/rule/node.tag/source/mac-address/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def b/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def index 1f235f7..6e0e9a6 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/protocol/node.def @@ -8,7 +8,7 @@ val_help: tcp_udp; Both TCP and UDP val_help: all; All IP protocols val_help: !<protocol>; All IP protocols except for the specified name or number -syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type.pl protocol_negate '$VAR(@)'`\" ] \ +syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type protocol_negate '$VAR(@)'`\" ] \ && [ \"$VAR(@)\" != 'tcp_udp' ]; then \ echo invalid protocol \"$VAR(@)\" ; \ exit 1 ; \ diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/mac-address/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/mac-address/node.def index ad07881..5519871 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/source/mac-address/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/source/mac-address/node.def @@ -1,3 +1,3 @@ type: txt help: Source MAC address -syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl macaddr_negate '$VAR(@)'" ; "invalid MAC address \"$VAR(@)\"" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type macaddr_negate '$VAR(@)'" ; "invalid MAC address \"$VAR(@)\"" |