diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2009-06-30 18:19:15 -0700 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2009-06-30 18:19:15 -0700 |
| commit | e66fce16ee35ceef3d4a0bd949a2faa8000fc056 (patch) | |
| tree | 50dd525568d8d3f17b7b15d033e2e6a646c0f7be /scripts | |
| parent | 6efa3f143978748df50f2f9dda20eb19298dc18a (diff) | |
| download | vyatta-cfg-system-e66fce16ee35ceef3d4a0bd949a2faa8000fc056.tar.gz vyatta-cfg-system-e66fce16ee35ceef3d4a0bd949a2faa8000fc056.zip | |
Fix Bug 4593 zone-policy can't be deleted if zone interfaces are bridges
* use new api to get active plus committed nodes
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/zone-mgmt/vyatta-zone.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/zone-mgmt/vyatta-zone.pl b/scripts/zone-mgmt/vyatta-zone.pl index c71fc2a1..7d2206cb 100755 --- a/scripts/zone-mgmt/vyatta-zone.pl +++ b/scripts/zone-mgmt/vyatta-zone.pl @@ -339,7 +339,7 @@ $zone_chain with failed [$error]" if $error; my @all_zones = Vyatta::Zone::get_all_zones("listOrigNodes"); foreach my $zone (@all_zones) { if (!($zone eq $zone_name)) { - my @from_zones = Vyatta::Zone::get_from_zones("listOrigNodes", $zone); + my @from_zones = Vyatta::Zone::get_from_zones("listOrigPlusComNodes", $zone); if (scalar(grep(/^$zone_name$/, @from_zones)) > 0) { foreach my $tree (keys %cmd_hash) { # call function to delete rules from $zone's chain @@ -352,7 +352,7 @@ $zone_chain with failed [$error]" if $error; } # if you have local from zone, delete interface to local zone out chain - my @my_from_zones = Vyatta::Zone::get_from_zones("listOrigNodes", $zone_name); + my @my_from_zones = Vyatta::Zone::get_from_zones("listOrigPlusComNodes", $zone_name); foreach my $fromzone (@my_from_zones) { if (defined(Vyatta::Zone::is_local_zone("existsOrig", $fromzone))) { foreach my $tree (keys %cmd_hash) { @@ -433,7 +433,7 @@ $zone_chain chain failed [$error]" if $error; my @all_zones = Vyatta::Zone::get_all_zones("listOrigNodes"); foreach my $zone (@all_zones) { if (!($zone eq $zone_name)) { - my @from_zones = Vyatta::Zone::get_from_zones("listOrigNodes", $zone); + my @from_zones = Vyatta::Zone::get_from_zones("listOrigPlusComNodes", $zone); if (scalar(grep(/^$zone_name$/, @from_zones)) > 0) { foreach my $tree (keys %cmd_hash) { my @zone_interfaces = |