diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-12-13 11:08:32 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-12-13 11:08:32 +0100 |
| commit | 5cb00b3afb199bc226ce92de1b3e7f8b84bb7397 (patch) | |
| tree | d010fc29224d00b3c135ee4e8100f55c23ffb2ec /src/conftest/config.c | |
| parent | df75cc5c5fb2e500688c6de0b3e30c27f93bcb91 (diff) | |
| download | strongswan-5cb00b3afb199bc226ce92de1b3e7f8b84bb7397.tar.bz2 strongswan-5cb00b3afb199bc226ce92de1b3e7f8b84bb7397.tar.xz | |
Fixed reading of configs in conftest utility
Diffstat (limited to 'src/conftest/config.c')
| -rw-r--r-- | src/conftest/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conftest/config.c b/src/conftest/config.c index 98f3dc433..f896b9537 100644 --- a/src/conftest/config.c +++ b/src/conftest/config.c @@ -181,7 +181,7 @@ static child_cfg_t *load_child_config(private_config_t *this, child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP)); } - token = settings->get_str(settings, "configs.%s.%s.lts", NULL, config); + token = settings->get_str(settings, "configs.%s.%s.lts", NULL, config, child); if (token) { enumerator = enumerator_create_token(token, ",", " "); @@ -205,7 +205,7 @@ static child_cfg_t *load_child_config(private_config_t *this, child_cfg->add_traffic_selector(child_cfg, TRUE, ts); } - token = settings->get_str(settings, "configs.%s.%s.rts", NULL, config); + token = settings->get_str(settings, "configs.%s.%s.rts", NULL, config, child); if (token) { enumerator = enumerator_create_token(token, ",", " "); @@ -262,12 +262,12 @@ static peer_cfg_t *load_peer_config(private_config_t *this, auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_PUBKEY); rid = identification_create_from_string( settings->get_str(settings, "configs.%s.rid", "%any", config)); - strength = settings->get_int(settings, "configs.%s.rsa_strength", 0); + strength = settings->get_int(settings, "configs.%s.rsa_strength", 0, config); if (strength) { auth->add(auth, AUTH_RULE_RSA_STRENGTH, strength); } - strength = settings->get_int(settings, "configs.%s.ecdsa_strength", 0); + strength = settings->get_int(settings, "configs.%s.ecdsa_strength", 0, config); if (strength) { auth->add(auth, AUTH_RULE_ECDSA_STRENGTH, strength); |