diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-04-16 11:53:06 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-04-16 13:44:27 +0200 |
| commit | b241a374117f32be724d3f6ad13cf4b7d42445b4 (patch) | |
| tree | 461283cfe7d6c6cf1e1bec97cdae81b22f324f95 /src | |
| parent | b447af658ce83153ac90f1bcd5b67ff8ba484f71 (diff) | |
| download | strongswan-b241a374117f32be724d3f6ad13cf4b7d42445b4.tar.bz2 strongswan-b241a374117f32be724d3f6ad13cf4b7d42445b4.tar.xz | |
Fall back on IP address as IDi if none is configured at all.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/sa/tasks/ike_auth.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c index ae8ef0a14..389465d1a 100644 --- a/src/libcharon/sa/tasks/ike_auth.c +++ b/src/libcharon/sa/tasks/ike_auth.c @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Tobias Brunner * Copyright (C) 2005-2009 Martin Willi * Copyright (C) 2005 Jan Hutter * Hochschule fuer Technik Rapperswil @@ -417,18 +418,17 @@ METHOD(task_t, build_i, status_t, cfg = this->ike_sa->get_auth_cfg(this->ike_sa, TRUE); cfg->merge(cfg, get_auth_cfg(this, TRUE), TRUE); idi = cfg->get(cfg, AUTH_RULE_IDENTITY); - if (!idi) - { - DBG1(DBG_CFG, "configuration misses IDi"); - return FAILED; - } - else if (idi->get_type(idi) == ID_ANY) + if (!idi || idi->get_type(idi) == ID_ANY) { /* ID_ANY is invalid as IDi, use local IP address instead */ host_t *me; + 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)); - cfg->replace_value(cfg, AUTH_RULE_IDENTITY, idi); + if (!cfg->replace_value(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); |