From 2d289a330870458ed5f0be4619d48eb551cb152d Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Fri, 16 Feb 2018 15:20:07 -0800
Subject: Just a little cleanup

---
 service/OneService.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'service')

diff --git a/service/OneService.cpp b/service/OneService.cpp
index 7013d9dc..7340c954 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -531,10 +531,12 @@ public:
 #ifdef ZT_USE_MINIUPNPC
 		,_portMapper((PortMapper *)0)
 #endif
+#ifdef ZT_VAULT_SUPPORT
 		,_vaultEnabled(false)
 		,_vaultURL()
 		,_vaultToken()
 		,_vaultPath("cubbyhole/zerotier")
+#endif
 		,_run(true)
 	{
 		_ports[0] = 0;
@@ -551,6 +553,10 @@ public:
 		_binder.closeAll(_phy);
 		_phy.close(_localControlSocket4);
 		_phy.close(_localControlSocket6);
+#if ZT_VAULT_SUPPORT
+		curl_global_cleanup();
+#endif
+
 #ifdef ZT_USE_MINIUPNPC
 		delete _portMapper;
 #endif
@@ -1541,6 +1547,7 @@ public:
 			}
 		}
 
+#if ZT_VAULT_SUPPORT
 		json &vault = settings["vault"];
 		if (vault.is_object()) {
 			const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str());
@@ -1579,6 +1586,7 @@ public:
 		if (!_vaultURL.empty() && !_vaultToken.empty()) {
 			_vaultEnabled = true;
 		}
+#endif
 	}
 
 	// Checks if a managed IP or route target is allowed
-- 
cgit v1.2.3