summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-07-31 16:01:30 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-07-31 16:56:49 -0700
commitf51a7d45564720a6e7af25dea13581b5de63b29d (patch)
treec3770fbbb00d12bed80d14e499eaa8f3a72ac5d6
parent8519768fc563db29e29d9e81ca3198b7e003bc61 (diff)
downloadvyatta-cfg-firewall-f51a7d45564720a6e7af25dea13581b5de63b29d.tar.gz
vyatta-cfg-firewall-f51a7d45564720a6e7af25dea13581b5de63b29d.zip
Another attempt to fix 4760.
(cherry picked from commit 4dadce6ebca29e6f6d7120a44541fd99034417f2)
-rwxr-xr-xscripts/firewall/vyatta-ipset.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/firewall/vyatta-ipset.pl b/scripts/firewall/vyatta-ipset.pl
index 57b8ce1..9402417 100755
--- a/scripts/firewall/vyatta-ipset.pl
+++ b/scripts/firewall/vyatta-ipset.pl
@@ -74,7 +74,10 @@ sub ipset_delete_member {
die "Error: undefined member" if ! defined $member;
my $group = new Vyatta::IpTables::IpSet($set_name);
- return $group->delete_member($member);
+ if ($group->exists($set_name) && $group->check_member($member)) {
+ return $group->delete_member($member);
+ }
+ return;
}
sub ipset_check_set_type {