00db14
From dcb5af32ea618c42e353f399962bdd6dc1c8a7d9 Mon Sep 17 00:00:00 2001
00db14
From: Quentin Armitage <quentin@armitage.org.uk>
00db14
Date: Mon, 27 Mar 2017 20:44:50 +0100
00db14
Subject: [PATCH 3/3] Don't attempt to remove ipsets if ipset handling not
00db14
 initialised
00db14
00db14
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
00db14
---
00db14
 keepalived/vrrp/vrrp_ipset.c | 5 +++++
00db14
 1 file changed, 5 insertions(+)
00db14
00db14
diff --git a/keepalived/vrrp/vrrp_ipset.c b/keepalived/vrrp/vrrp_ipset.c
00db14
index 1c3e4990..b40bc836 100644
00db14
--- a/keepalived/vrrp/vrrp_ipset.c
00db14
+++ b/keepalived/vrrp/vrrp_ipset.c
00db14
@@ -270,6 +270,11 @@ bool remove_ipsets(void)
00db14
 	if (!global_data->using_ipsets)
00db14
 		return true;
00db14
 
00db14
+#ifdef _LIBIPSET_DYNAMIC_
00db14
+	if (!libipset_handle)
00db14
+		return true;
00db14
+#endif
00db14
+
00db14
 	session = ipset_session_init(printf);
00db14
 	if (!session) {
00db14
 		log_message(LOG_INFO, "Cannot initialize ipset session.");
00db14
-- 
00db14
2.13.5
00db14