diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:34:31 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:34:31 +0200 |
| commit | fbc72527765b236a65740cd5d9f7f2c3f7e9a87e (patch) | |
| tree | 13c5bd2858ff8fb561f3057c970821c7d503cc99 /templates/firewall/group/address-group | |
| parent | 7d1875d601e0c975f1ab7ae57f7595b49e401390 (diff) | |
| parent | 96a8f5e74295e3a06bb8c2ca92e1b35597db9377 (diff) | |
| download | vyatta-cfg-firewall-lithium.tar.gz vyatta-cfg-firewall-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
Diffstat (limited to 'templates/firewall/group/address-group')
| -rw-r--r-- | templates/firewall/group/address-group/node.def | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/firewall/group/address-group/node.def b/templates/firewall/group/address-group/node.def index 13b2e72..d89233d 100644 --- a/templates/firewall/group/address-group/node.def +++ b/templates/firewall/group/address-group/node.def @@ -15,7 +15,11 @@ syntax:expression: pattern $VAR(@) "^[^!]" ; \ syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ "Firewall group name cannot contain shell punctuation" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-defined --set-name=$VAR(@) \ + --set-type=address --set-family=inet"; \ + "Firewall group name already used as Ipv6 group address" + end: if sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=update-set \ - --set-name="$VAR(@)" --set-type=address; then + --set-name="$VAR(@)" --set-type=address --set-family=inet; then ${vyatta_sbindir}/vyatta-firewall-trap.pl --level="firewall group address-group $VAR(@)" fi |