From: Martin Willi <martin@revosec.ch>
Date: Fri, 19 Aug 2011 07:12:54 +0000 (+0200)
Subject: Added a certexpire empty_string option
X-Git-Tag: 4.6.0~541
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=3f455c739d0667e7dfb799fae71ca8bc3e8cae0f;ds=sidebyside

Added a certexpire empty_string option
---

diff --git a/src/libcharon/plugins/certexpire/certexpire_export.c b/src/libcharon/plugins/certexpire/certexpire_export.c
index 7976724..c73b0be 100644
--- a/src/libcharon/plugins/certexpire/certexpire_export.c
+++ b/src/libcharon/plugins/certexpire/certexpire_export.c
@@ -82,6 +82,11 @@ struct private_certexpire_export_t {
 	 * TRUE to use fixed field count, CA at end
 	 */
 	bool fixed_fields;
+
+	/**
+	 * String to use in empty fields, if using fixed_fields
+	 */
+	char *empty_string;
 };
 
 /**
@@ -156,10 +161,14 @@ static void export_csv(private_certexpire_export_t *this, char *path,
 				{
 					fprintf(file, "\n");
 				}
-				else if (this->fixed_fields || entry->expire[i])
+				else if (entry->expire[i])
 				{
 					fprintf(file, "%s", this->separator);
 				}
+				else if (this->fixed_fields)
+				{
+					fprintf(file, "%s%s", this->empty_string, this->separator);
+				}
 			}
 			chains->remove_at(chains, enumerator);
 			free(entry);
@@ -364,6 +373,8 @@ certexpire_export_t *certexpire_export_create()
 							"charon.plugins.certexpire.csv.format", "%d:%m:%Y"),
 		.fixed_fields = lib->settings->get_bool(lib->settings,
 							"charon.plugins.certexpire.csv.fixed_fields", TRUE),
+		.empty_string = lib->settings->get_str(lib->settings,
+							"charon.plugins.certexpire.csv.empty_string", ""),
 	);
 
 	cron = lib->settings->get_str(lib->settings,