From beab4a90aef5aea018d2bb2159cae3dbfd760cee Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 4 Jan 2012 17:32:41 +0100 Subject: [PATCH] Query for XAuth identity in get_other_eap_id(), too --- src/libcharon/sa/ike_sa.c | 4 ++++ 1 file changed, 4 insertions(+) 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); } -- 2.47.3