diff options
| author | Marian Tudosoiu <marian.tudosoiu@1and1.ro> | 2018-03-14 10:27:25 +0200 |
|---|---|---|
| committer | Marian Tudosoiu <marian.tudosoiu@1and1.ro> | 2018-03-14 10:27:25 +0200 |
| commit | 65410961b33a072addf91dce7879f6a734aa2187 (patch) | |
| tree | 54fe57581540f2e0f21573dfecd8d73f7dd3c9dd /scripts | |
| parent | 4e3ea201d7902d9a0641bbecf42d7e837595e01b (diff) | |
| download | vyatta-cfg-firewall-65410961b33a072addf91dce7879f6a734aa2187.tar.gz vyatta-cfg-firewall-65410961b33a072addf91dce7879f6a734aa2187.zip | |
Task T35 change to place ipv6 address-groups and network groups under group config tree
Diffstat (limited to 'scripts')
| -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 |