From b03c700d08aed1b29f02867608f9bc0037d2ae8f Mon Sep 17 00:00:00 2001
From: Clavister OpenSource <opensource@clavister.com>
Date: Thu, 24 Nov 2011 16:57:10 +0100
Subject: [PATCH] IKEv1 XAuth: Changed the xauth_request task to use the new
 MIGRATE status.

---
 src/libcharon/sa/task_manager_v1.c | 3 +++
 src/libcharon/sa/tasks/main_mode.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libcharon/sa/task_manager_v1.c b/src/libcharon/sa/task_manager_v1.c
index d5474d962..2b22bcdb5 100644
--- a/src/libcharon/sa/task_manager_v1.c
+++ b/src/libcharon/sa/task_manager_v1.c
@@ -22,6 +22,7 @@
 #include <sa/tasks/ike_vendor.h>
 #include <sa/tasks/main_mode.h>
 #include <sa/tasks/quick_mode.h>
+#include <sa/tasks/xauth_request.h>
 #include <processing/jobs/retransmit_job.h>
 
 typedef struct exchange_t exchange_t;
@@ -536,6 +537,8 @@ static status_t process_request(private_task_manager_t *this,
 				this->passive_tasks->insert_last(this->passive_tasks, task);
 				task = (task_t *)main_mode_create(this->ike_sa, FALSE);
 				this->passive_tasks->insert_last(this->passive_tasks, task);
+				task = (task_t *)xauth_request_create(this->ike_sa, FALSE);
+				this->passive_tasks->insert_last(this->passive_tasks, task);
 				break;
 			case AGGRESSIVE:
 				/* TODO-IKEv1: agressive mode */
diff --git a/src/libcharon/sa/tasks/main_mode.c b/src/libcharon/sa/tasks/main_mode.c
index d3d1cbe87..f59276714 100644
--- a/src/libcharon/sa/tasks/main_mode.c
+++ b/src/libcharon/sa/tasks/main_mode.c
@@ -624,7 +624,7 @@ METHOD(task_t, build_r, status_t,
 			/* TODO-IKEv1: Check the proposal for XAuthInit* auth modes */
 			/* TODO-IKEv1: check for XAUTH rounds, queue them */
 			if(0) /* TODO-IKEv1: Change to 1 if XAUTH is desired. */
-			this->ike_sa->initiate_xauth(this->ike_sa);
+				return MIGRATE;
 			return SUCCESS;
 		}
 		default: