From: Martin Willi <martin@revosec.ch>
Date: Wed, 4 Jan 2012 16:32:41 +0000 (+0100)
Subject: Query for XAuth identity in get_other_eap_id(), too
X-Git-Tag: 5.0.0~338^2~9^2~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beab4a90aef5aea018d2bb2159cae3dbfd760cee;p=thirdparty%2Fstrongswan.git

Query for XAuth identity in get_other_eap_id(), too
---

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 73b4ba24b5..d659a3c681 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1182,6 +1182,10 @@ METHOD(ike_sa_t, get_other_eap_id, identification_t*,
 		/* prefer EAP-Identity of last round */
 		current = cfg->get(cfg, AUTH_RULE_EAP_IDENTITY);
 		if (!current || current->get_type(current) == ID_ANY)
+		{
+			current = cfg->get(cfg, AUTH_RULE_XAUTH_IDENTITY);
+		}
+		if (!current || current->get_type(current) == ID_ANY)
 		{
 			current = cfg->get(cfg, AUTH_RULE_IDENTITY);
 		}