denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a certexpire empty_string option

Browse Source
This commit is contained in:
Martin Willi
2011-08-22 18:42:33 +02:00
parent e64fdfa172
commit 3f455c739d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/certexpire/certexpire_export.c
+12 -1
View File
@@ -82,6 +82,11 @@ struct private_certexpire_export_t {
* TRUE to use fixed field count, CA at end * TRUE to use fixed field count, CA at end
*/ */
bool fixed_fields; 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"); fprintf(file, "\n");
} }
else if (this->fixed_fields || entry->expire[i]) else if (entry->expire[i])
{ {
fprintf(file, "%s", this->separator); fprintf(file, "%s", this->separator);
} }
else if (this->fixed_fields)
{
fprintf(file, "%s%s", this->empty_string, this->separator);
}
} }
chains->remove_at(chains, enumerator); chains->remove_at(chains, enumerator);
free(entry); free(entry);
@@ -364,6 +373,8 @@ certexpire_export_t *certexpire_export_create()
"charon.plugins.certexpire.csv.format", "%d:%m:%Y"), "charon.plugins.certexpire.csv.format", "%d:%m:%Y"),
.fixed_fields = lib->settings->get_bool(lib->settings, .fixed_fields = lib->settings->get_bool(lib->settings,
"charon.plugins.certexpire.csv.fixed_fields", TRUE), "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, cron = lib->settings->get_str(lib->settings,