diff options
Diffstat (limited to 'src/libcharon')
| -rw-r--r-- | src/libcharon/plugins/stroke/stroke_config.c | 6 | ||||
| -rw-r--r-- | src/libcharon/sa/authenticators/eap_authenticator.c | 5 | ||||
| -rw-r--r-- | src/libcharon/sa/tasks/ike_auth.c | 10 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c index 6b7481988..5a6c22fb3 100644 --- a/src/libcharon/plugins/stroke/stroke_config.c +++ b/src/libcharon/plugins/stroke/stroke_config.c @@ -1039,11 +1039,7 @@ METHOD(stroke_config_t, set_user_credentials, void, auth_class = (uintptr_t)auth_cfg->get(auth_cfg, AUTH_RULE_AUTH_CLASS); if (auth_class == AUTH_CLASS_EAP) { - identity = id->clone(id); - if (!auth_cfg->replace_value(auth_cfg, AUTH_RULE_EAP_IDENTITY, identity)) - { - auth_cfg->add(auth_cfg, AUTH_RULE_EAP_IDENTITY, identity); - } + auth_cfg->add(auth_cfg, AUTH_RULE_EAP_IDENTITY, id->clone(id)); /* if aaa_identity is specified use that as remote ID */ identity = auth_cfg->get(auth_cfg, AUTH_RULE_AAA_IDENTITY); if (identity && identity->get_type(identity) != ID_ANY) diff --git a/src/libcharon/sa/authenticators/eap_authenticator.c b/src/libcharon/sa/authenticators/eap_authenticator.c index 7284dfc8a..5c8f0b6ce 100644 --- a/src/libcharon/sa/authenticators/eap_authenticator.c +++ b/src/libcharon/sa/authenticators/eap_authenticator.c @@ -223,10 +223,7 @@ static void replace_eap_identity(private_eap_authenticator_t *this) eap_identity = this->eap_identity->clone(this->eap_identity); cfg = this->ike_sa->get_auth_cfg(this->ike_sa, FALSE); - if (!cfg->replace_value(cfg, AUTH_RULE_EAP_IDENTITY, eap_identity)) - { - eap_identity->destroy(eap_identity); - } + cfg->add(cfg, AUTH_RULE_EAP_IDENTITY, eap_identity); } /** diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c index 7552097f9..665468fe8 100644 --- a/src/libcharon/sa/tasks/ike_auth.c +++ b/src/libcharon/sa/tasks/ike_auth.c @@ -425,10 +425,7 @@ METHOD(task_t, build_i, status_t, DBG1(DBG_CFG, "no IDi configured, fall back on IP address"); me = this->ike_sa->get_my_host(this->ike_sa); idi = identification_create_from_sockaddr(me->get_sockaddr(me)); - if (!cfg->replace_value(cfg, AUTH_RULE_IDENTITY, idi)) - { - cfg->add(cfg, AUTH_RULE_IDENTITY, idi); - } + cfg->add(cfg, AUTH_RULE_IDENTITY, idi); } this->ike_sa->set_my_id(this->ike_sa, idi->clone(idi)); id_payload = id_payload_create_from_identification(ID_INITIATOR, idi); @@ -702,10 +699,7 @@ METHOD(task_t, build_r, status_t, me = this->ike_sa->get_my_host(this->ike_sa); id_cfg = identification_create_from_sockaddr( me->get_sockaddr(me)); - if (!cfg->replace_value(cfg, AUTH_RULE_IDENTITY, id_cfg)) - { - cfg->add(cfg, AUTH_RULE_IDENTITY, id_cfg); - } + cfg->add(cfg, AUTH_RULE_IDENTITY, id_cfg); } this->ike_sa->set_my_id(this->ike_sa, id_cfg->clone(id_cfg)); id = id_cfg; |