From: Martin Willi <martin@revosec.ch>
Date: Thu, 26 Jul 2012 10:07:48 +0000 (+0200)
Subject: Merge auth config items added from XAuth backends to IKE_SA
X-Git-Tag: 5.0.1~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9191946a63dac2ff4ee3ce2ec732cbf699193d3d;p=thirdparty%2Fstrongswan.git

Merge auth config items added from XAuth backends to IKE_SA
---

diff --git a/src/libcharon/sa/ikev1/tasks/xauth.c b/src/libcharon/sa/ikev1/tasks/xauth.c
index 12dd127813..446445a554 100644
--- a/src/libcharon/sa/ikev1/tasks/xauth.c
+++ b/src/libcharon/sa/ikev1/tasks/xauth.c
@@ -190,6 +190,7 @@ static void add_auth_cfg(private_xauth_t *this, identification_t *id, bool local
 	auth = auth_cfg_create();
 	auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_XAUTH);
 	auth->add(auth, AUTH_RULE_XAUTH_IDENTITY, id->clone(id));
+	auth->merge(auth, this->ike_sa->get_auth_cfg(this->ike_sa, local), FALSE);
 
 	this->ike_sa->add_auth_cfg(this->ike_sa, local, auth);
 }