From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 24 Jul 2017 09:34:39 +0000 (+0200)
Subject: swima-collector: Fix compile error if SWID_DIRECTORY is not defined
X-Git-Tag: 5.6.0dr4~18
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6b69a66379da3948b927de70f71fc5d0f797f5f8;p=thirdparty%2Fstrongswan.git

swima-collector: Fix compile error if SWID_DIRECTORY is not defined
---

diff --git a/src/libimcv/swima/swima_collector.c b/src/libimcv/swima/swima_collector.c
index ab5a7b6837..0fd3d14b30 100644
--- a/src/libimcv/swima/swima_collector.c
+++ b/src/libimcv/swima/swima_collector.c
@@ -29,6 +29,10 @@
 #define SOURCE_ID_GENERATOR		1
 #define SOURCE_ID_COLLECTOR		2
 
+#ifndef SWID_DIRECTORY
+#define SWID_DIRECTORY NULL
+#endif
+
 #define SWID_GENERATOR	"/usr/local/bin/swid_generator"
 
 /**
@@ -386,6 +390,11 @@ static bool collect_tags(private_swima_collector_t *this, char *pathname,
 	enumerator_t *enumerator;
 	int i;
 
+	if (!pathname)
+	{
+		return TRUE;
+	}
+
 	enumerator = enumerator_create_directory(pathname);
 	if (!enumerator)
 	{
@@ -618,7 +627,7 @@ swima_collector_t *swima_collector_create(void)
 			{
 				DBG1(DBG_IMC, "database query for last event failed");
 				DESTROY_IF(e);
-				db->destroy(db);				
+				db->destroy(db);
 			}
 			else
 			{