diff options
author | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-08-05 17:33:25 +0700 |
---|---|---|
committer | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-08-05 17:33:25 +0700 |
commit | ba0511c9a72f1c2c9d0b4adc0ae72727cce08814 (patch) | |
tree | 2601a4555fadf35db251afcef39a28e7c2e60538 /templates-cfg | |
parent | 6d9903118b3ddb01e26db62a7c5762bcef8df39c (diff) | |
download | vyatta-nat-ba0511c9a72f1c2c9d0b4adc0ae72727cce08814.tar.gz vyatta-nat-ba0511c9a72f1c2c9d0b4adc0ae72727cce08814.zip |
Bug 4946: Modify NAT templates not to issue a warning when eth+ or other interface group name suitable for NAT is specified as inboud or outbound interface.
Diffstat (limited to 'templates-cfg')
-rw-r--r-- | templates-cfg/nat/rule/node.tag/inbound-interface/node.def | 7 | ||||
-rw-r--r-- | templates-cfg/nat/rule/node.tag/outbound-interface/node.def | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/templates-cfg/nat/rule/node.tag/inbound-interface/node.def b/templates-cfg/nat/rule/node.tag/inbound-interface/node.def index 43c2998..03466b9 100644 --- a/templates-cfg/nat/rule/node.tag/inbound-interface/node.def +++ b/templates-cfg/nat/rule/node.tag/inbound-interface/node.def @@ -20,4 +20,11 @@ commit:expression: exec " fi let i++ done + intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" + i=0 + for i in $intf_group_name_array; do + if [ \"$i\" == \"$VAR(@)\" ]; then + exit 0 + fi + done echo NAT configuration warning: interface $VAR(@) does not exist on this system " diff --git a/templates-cfg/nat/rule/node.tag/outbound-interface/node.def b/templates-cfg/nat/rule/node.tag/outbound-interface/node.def index fa432cf..efbd9c3 100644 --- a/templates-cfg/nat/rule/node.tag/outbound-interface/node.def +++ b/templates-cfg/nat/rule/node.tag/outbound-interface/node.def @@ -20,4 +20,11 @@ commit:expression: exec " fi let i++ done + intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\" + i=0 + for i in $intf_group_name_array; do + if [ \"$i\" == \"$VAR(@)\" ]; then + exit 0 + fi + done echo NAT configuration warning: interface $VAR(@) does not exist on this system " |