From f51a7d45564720a6e7af25dea13581b5de63b29d Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Fri, 31 Jul 2009 16:01:30 -0700
Subject: Another attempt to fix 4760. (cherry picked from commit
 4dadce6ebca29e6f6d7120a44541fd99034417f2)

---
 scripts/firewall/vyatta-ipset.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts/firewall')

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 {
-- 
cgit v1.2.3