Query for XAuth identity in get_other_eap_id(), too
authorMartin Willi <martin@revosec.ch>
Wed, 4 Jan 2012 16:32:41 +0000 (17:32 +0100)
committerMartin Willi <martin@revosec.ch>
Tue, 20 Mar 2012 16:31:32 +0000 (17:31 +0100)
src/libcharon/sa/ike_sa.c

index 73b4ba2..d659a3c 100644 (file)
@@ -1183,6 +1183,10 @@ METHOD(ike_sa_t, get_other_eap_id, identification_t*,
                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);
                }
                if (current && current->get_type(current) != ID_ANY)