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 73b4ba24b536ca6ea327d47b7d7902f0a1de909c..d659a3c681398cf3a0370f3a0a0b87bc8a340d05 100644 (file)
--- 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);
                }