diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-03-16 06:19:07 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 06:19:07 +0700 |
| commit | ce9af44139520d8a0f1f3e25cfe06e68e48f8cea (patch) | |
| tree | cc6b0a7c249e97af7e42cd026a2ef5dd04e0e80d /scripts/firewall | |
| parent | 98d47b93bbac7abcc26f073329d4f1180deb47c1 (diff) | |
| parent | 1d21300885e606ec9e8da2b9a9b7af898d896a24 (diff) | |
| download | vyatta-cfg-firewall-ce9af44139520d8a0f1f3e25cfe06e68e48f8cea.tar.gz vyatta-cfg-firewall-ce9af44139520d8a0f1f3e25cfe06e68e48f8cea.zip | |
Merge pull request #8 from mtudosoiu/current
Task T35 place ipv6 groups under global group config tree
Diffstat (limited to 'scripts/firewall')
| -rwxr-xr-x | scripts/firewall/vyatta-ipset.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/firewall/vyatta-ipset.pl b/scripts/firewall/vyatta-ipset.pl index f18237d..0f7f731 100755 --- a/scripts/firewall/vyatta-ipset.pl +++ b/scripts/firewall/vyatta-ipset.pl @@ -252,7 +252,7 @@ sub ipset_is_group_defined { die "Error: undefined set_type\n" if ! defined $set_type; die "Error: undefined set_family\n" if ! defined $set_family; - my $gpath = ($set_family eq 'inet') ? "firewall ipv6-group $set_type-group" : "firewall group $set_type-group"; + my $gpath = ($set_family eq 'inet') ? "firewall group ipv6-$set_type-group" : "firewall group $set_type-group"; my @groups = $cfg->listOrigNodes($gpath); my $group; foreach $group (@groups) { @@ -267,7 +267,7 @@ sub update_set { my ($set_name, $set_type, $set_family) = @_; my $cfg = new Vyatta::Config; my ($rc, $newset); - my $cpath = ($set_family eq 'inet') ? "firewall group $set_type-group $set_name" : "firewall ipv6-group $set_type-group $set_name"; + my $cpath = ($set_family eq 'inet') ? "firewall group $set_type-group $set_name" : "firewall group ipv6-$set_type-group $set_name"; if ($cfg->existsOrig($cpath)) { if (!$cfg->exists($cpath)) { # deleted |