>From 4c8233ef12eec9787536b9028618e76d188db372 Mon Sep 17 00:00:00 2001
From: Matthias Berndt <matthias berndt riskident com>
Date: Fri, 22 Jan 2016 13:52:38 +0100
Subject: [PATCH 1/3] - allow comment lines inside blobs - prevent do_import
 from processing lines that   were already processed by handle_blob_item

---
 properties/import-export.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/properties/import-export.c b/properties/import-export.c
index d624b52..0ef037a 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -222,7 +222,7 @@ handle_blob_item (const char ***line,
 			p++; \
 			if (!*p) \
 				goto finish; \
-		} while (!*p[0]); \
+		} while (*p[0] == '\0' || *p[0] == '#' || *p[0] == ';'); \
 	} G_STMT_END
 
 	if (!strcmp (key, NM_OPENVPN_KEY_CA)) {
@@ -294,7 +294,7 @@ handle_blob_item (const char ***line,
 	nm_setting_vpn_add_data_item (s_vpn, key, path);
 
 finish:
-	line = &p;
+	*line = p;
 	g_free (filename);
 	g_free (dirname);
 	g_free (path);
-- 
2.5.0