eap-radius: do RADIUS/IKE attribute forwarding in XAuth backend

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_forward.c b/src/libcharon/plugins/eap_radius/eap_radius_forward.c
index e9124877c8d9df923d213419126e69b0f0e25ab5..3e80e8918bfed6eedb2b8248952df5db84385600 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_forward.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_forward.c
@@ -248,7 +248,8 @@ static void ike2queue(message_t *message, linked_list_t *queue,
        enumerator = message->create_payload_enumerator(message);
        while (enumerator->enumerate(enumerator, &payload))
        {
-               if (payload->get_type(payload) == NOTIFY)
+               if (payload->get_type(payload) == NOTIFY ||
+                       payload->get_type(payload) == NOTIFY_V1)
                {
                        notify = (notify_payload_t*)payload;
                        if (notify->get_notify_type(notify) == RADIUS_ATTRIBUTE)

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_xauth.c b/src/libcharon/plugins/eap_radius/eap_radius_xauth.c
index caca93fe84456f263580aaf4d7b90ade762c9f29..bd960d2bcd2e7db02155f86d66e4cd88d582353b 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_xauth.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_xauth.c
@@ -16,6 +16,7 @@
 #include "eap_radius_xauth.h"
 #include "eap_radius_plugin.h"
 #include "eap_radius.h"
+#include "eap_radius_forward.h"
 
 #include <daemon.h>
 #include <radius_client.h>
@@ -76,10 +77,12 @@ static status_t verify_radius(private_eap_radius_xauth_t *this, chunk_t pass)
        request->add(request, RAT_USER_PASSWORD, pass);
 
        eap_radius_build_attributes(request);
+       eap_radius_forward_from_ike(request);
 
        response = this->client->request(this->client, request);
        if (response)
        {
+               eap_radius_forward_to_ike(response);
                switch (response->get_code(response))
                {
                        case RMC_ACCESS_ACCEPT: