diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-04-17 17:44:10 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-04-18 18:50:14 +0200 |
| commit | 7e84c4275c03b1aaf3c4a2077b08f67173fad382 (patch) | |
| tree | 0972d8a15b4252cad0891dee635cbdae09e8d9bc /src/libcharon/sa/tasks/ike_auth.c | |
| parent | ebc1ffe45100d31ca0094fb407747a0ad995bf8e (diff) | |
| download | strongswan-7e84c4275c03b1aaf3c4a2077b08f67173fad382.tar.bz2 strongswan-7e84c4275c03b1aaf3c4a2077b08f67173fad382.tar.xz | |
Removed auth_cfg_t.replace_value() and replaced usages with add().
replace_value() was used to replace identities. Since for these the latest is
now returned by get(), adding the new identity with add() is sufficient.
Diffstat (limited to 'src/libcharon/sa/tasks/ike_auth.c')
| -rw-r--r-- | src/libcharon/sa/tasks/ike_auth.c | 10 |
1 files changed, 2 insertions, 8 deletions
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; |