aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2014-10-02 12:40:00 +0200
committerTobias Brunner <tobias@strongswan.org>2014-10-07 13:46:18 +0200
commitd52b8738b540fb9c0a1c8266f7a96c1d7c55fede (patch)
tree753b9e6cc2f7f07e8ae49ef73b72c97f9e8f86cc /src/libcharon
parentd4828f51e080239f3d03cc4d45c36fbffe08bf3f (diff)
downloadstrongswan-d52b8738b540fb9c0a1c8266f7a96c1d7c55fede.tar.bz2
strongswan-d52b8738b540fb9c0a1c8266f7a96c1d7c55fede.tar.xz
ikev1: Fix handling of UNITY_LOAD_BALANCE
The re-authentication is now handled within the original IKE_SA if it has not yet been established, so we don't want to destroy it.
Diffstat (limited to 'src/libcharon')
-rw-r--r--src/libcharon/sa/ikev1/tasks/informational.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
index b742dbef9..2798978b2 100644
--- a/src/libcharon/sa/ikev1/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -112,16 +112,16 @@ METHOD(task_t, process_r, status_t,
IKEV2_UDP_PORT);
if (redirect)
{ /* treat the redirect as reauthentication */
- DBG1(DBG_IKE, "received %N notify. redirected to %H",
+ DBG1(DBG_IKE, "received %N notify, redirected to %H",
notify_type_names, type, redirect);
/* Cisco boxes reject the first message from 4500 */
me = this->ike_sa->get_my_host(this->ike_sa);
me->set_port(me, charon->socket->get_port(
charon->socket, FALSE));
this->ike_sa->set_other_host(this->ike_sa, redirect);
- this->ike_sa->reauth(this->ike_sa);
+ status = this->ike_sa->reauth(this->ike_sa);
enumerator->destroy(enumerator);
- return DESTROY_ME;
+ return status;
}
else
{