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

stroke: Allow specifying the ipsec.secrets location in strongswan.conf

Browse Source
This commit is contained in:
Shea Levy
2014-10-02 14:31:00 +02:00
committed by Tobias Brunner
parent 5fea45506e
commit 213e02b872
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+10 -2
View File
@@ -64,6 +64,11 @@ struct private_stroke_cred_t {
*/
stroke_cred_t public;
/**
* secrets file with credential information
*/
char *secrets_file;
/**
* credentials
*/
@@ -1297,7 +1302,7 @@ METHOD(stroke_cred_t, reread, void,
if (msg->reread.flags & REREAD_SECRETS)
{
DBG1(DBG_CFG, "rereading secrets");
load_secrets(this, NULL, SECRETS_FILE, 0, prompt);
load_secrets(this, NULL, this->secrets_file, 0, prompt);
}
if (msg->reread.flags & REREAD_CACERTS)
{
@@ -1370,6 +1375,9 @@ stroke_cred_t *stroke_cred_create()
.cachecrl = _cachecrl,
.destroy = _destroy,
},
.secrets_file = lib->settings->get_str(lib->settings,
"%s.plugins.stroke.secrets_file", SECRETS_FILE,
lib->ns),
.creds = mem_cred_create(),
);
@@ -1380,7 +1388,7 @@ stroke_cred_t *stroke_cred_create()
FALSE, lib->ns);
load_certs(this);
load_secrets(this, NULL, SECRETS_FILE, 0, NULL);
load_secrets(this, NULL, this->secrets_file, 0, NULL);
return &this->public;
}