libcharon: Use lib->ns instead of charon->name

This commit is contained in:
Tobias Brunner
2014-02-12 14:34:32 +01:00
parent 10c4f4e1fd
commit d223fe807a
72 changed files with 255 additions and 259 deletions
@@ -430,31 +430,31 @@ certexpire_export_t *certexpire_export_create()
(hashtable_equals_t)equals, 32),
.mutex = mutex_create(MUTEX_TYPE_DEFAULT),
.local_path = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.local",
NULL, charon->name),
"%s.plugins.certexpire.csv.local",
NULL, lib->ns),
.remote_path = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.remote",
NULL, charon->name),
"%s.plugins.certexpire.csv.remote",
NULL, lib->ns),
.separator = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.separator",
",", charon->name),
"%s.plugins.certexpire.csv.separator",
",", lib->ns),
.format = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.format",
"%d:%m:%Y", charon->name),
"%s.plugins.certexpire.csv.format",
"%d:%m:%Y", lib->ns),
.fixed_fields = lib->settings->get_bool(lib->settings,
"%s.plugins.certexpire.csv.fixed_fields",
TRUE, charon->name),
"%s.plugins.certexpire.csv.fixed_fields",
TRUE, lib->ns),
.empty_string = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.empty_string",
"", charon->name),
"%s.plugins.certexpire.csv.empty_string",
"", lib->ns),
.force = lib->settings->get_bool(lib->settings,
"%s.plugins.certexpire.csv.force",
TRUE, charon->name),
"%s.plugins.certexpire.csv.force",
TRUE, lib->ns),
);
cron = lib->settings->get_str(lib->settings,
"%s.plugins.certexpire.csv.cron",
NULL, charon->name);
NULL, lib->ns);
if (cron)
{
this->cron = certexpire_cron_create(cron,