From 719c33b41a1f9fe9b2585df3e7aa804a760c361c Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 10 Jan 2011 11:54:10 +0100 Subject: [PATCH] Send INITIAL_CONTACT even if we have a unique policy --- NEWS | 3 +-- src/libcharon/sa/tasks/ike_auth.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index fbae771cb..e8c050a57 100644 --- a/NEWS +++ b/NEWS @@ -42,8 +42,7 @@ strongswan-4.5.1 xcbc algorithms. - The IKEv2 daemon supports the INITIAL_CONTACT notify as initiator and - responder. The notify is sent when initiating configurations with a unique - policy, set in ipsec.conf via the global 'uniqueids' option. + responder. - The conftest conformance testing framework enables the IKEv2 stack to perform many tests using a distinct tool and configuration frontend. Various hooks diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c index 178989a0a..e48916eb2 100644 --- a/src/libcharon/sa/tasks/ike_auth.c +++ b/src/libcharon/sa/tasks/ike_auth.c @@ -429,8 +429,7 @@ static status_t build_i(private_ike_auth_t *this, message_t *message) get_reserved_id_bytes(this, id_payload); message->add_payload(message, (payload_t*)id_payload); - if (idr && message->get_message_id(message) == 1 && - this->peer_cfg->get_unique_policy(this->peer_cfg) != UNIQUE_NO) + if (idr && message->get_message_id(message)) { host_t *host;