aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/sa/tasks/ike_auth.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2011-01-13 10:50:46 +0100
committerMartin Willi <martin@revosec.ch>2011-01-13 10:50:46 +0100
commit983a5e88d330e28ec6b9726a365e372d3461141f (patch)
treed8286477f242976061e226ed256ebe981798a549 /src/libcharon/sa/tasks/ike_auth.c
parent9bac426bf3b9badf1c39d282e8d49881ffbe3142 (diff)
downloadstrongswan-983a5e88d330e28ec6b9726a365e372d3461141f.tar.bz2
strongswan-983a5e88d330e28ec6b9726a365e372d3461141f.tar.xz
Revert "Send INITIAL_CONTACT even if we have a unique policy"
It makes sense to omit INITIAL_CONTACT if don't have a unique policy, as a client might want to connect from different devices to the same account. This reverts commit 719c33b41a1f9fe9b2585df3e7aa804a760c361c.
Diffstat (limited to 'src/libcharon/sa/tasks/ike_auth.c')
-rw-r--r--src/libcharon/sa/tasks/ike_auth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcharon/sa/tasks/ike_auth.c b/src/libcharon/sa/tasks/ike_auth.c
index e48916eb2..178989a0a 100644
--- a/src/libcharon/sa/tasks/ike_auth.c
+++ b/src/libcharon/sa/tasks/ike_auth.c
@@ -429,7 +429,8 @@ 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))
+ if (idr && message->get_message_id(message) == 1 &&
+ this->peer_cfg->get_unique_policy(this->peer_cfg) != UNIQUE_NO)
{
host_t *host;