diff options
| author | Shea Levy <shea@shealevy.com> | 2014-09-30 15:11:03 -0400 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-10-02 14:31:00 +0200 |
| commit | 213e02b8725e5d1401d231a7de9d1cf30fcee2eb (patch) | |
| tree | d544e993a3ef7479d39db649b13770049ee95ae5 /src/libcharon/plugins/stroke | |
| parent | 5fea45506ee3c0712bb62d6ba311459164036d7e (diff) | |
| download | strongswan-213e02b8725e5d1401d231a7de9d1cf30fcee2eb.tar.bz2 strongswan-213e02b8725e5d1401d231a7de9d1cf30fcee2eb.tar.xz | |
stroke: Allow specifying the ipsec.secrets location in strongswan.conf
Diffstat (limited to 'src/libcharon/plugins/stroke')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_cred.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c index f908219ed..83431d17c 100644 --- a/src/libcharon/plugins/stroke/stroke_cred.c +++ b/src/libcharon/plugins/stroke/stroke_cred.c @@ -65,6 +65,11 @@ struct private_stroke_cred_t { stroke_cred_t public; /** + * secrets file with credential information + */ + char *secrets_file; + + /** * credentials */ mem_cred_t *creds; @@ -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; } |