Move debug messages into rad_virtual_server

[freeradius.git] / src / modules / rlm_eap / types / rlm_eap_peap / peap.c

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index aa03422..63093ab 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -463,7 +463,7 @@ static int CC_HINT(nonnull) process_reply(eap_handler_t *handler, tls_session_t
                        pairdelete(&reply->vps, 16, VENDORPEC_MICROSOFT, TAG_ANY);
                        pairdelete(&reply->vps, 17, VENDORPEC_MICROSOFT, TAG_ANY);
 
-                       rad_assert(!t->accept_vps);
+                       pairfree(&t->accept_vps); /* for proxying MS-CHAP2 */
                        pairfilter(t, &t->accept_vps, &reply->vps, 0, 0, TAG_ANY);
                        rad_assert(!reply->vps);
                }
@@ -485,7 +485,7 @@ static int CC_HINT(nonnull) process_reply(eap_handler_t *handler, tls_session_t
                 *      Get rid of the old State, too.
                 */
                pairfree(&t->state);
-               pairfilter(t, &t->state, &(reply->vps), PW_STATE, 0, TAG_ANY);
+               pairfilter(t, &t->state, &reply->vps, PW_STATE, 0, TAG_ANY);
 
                /*
                 *      PEAP takes only EAP-Message attributes inside
@@ -493,7 +493,7 @@ static int CC_HINT(nonnull) process_reply(eap_handler_t *handler, tls_session_t
                 *      Access-Challenge is ignored.
                 */
                vp = NULL;
-               pairfilter(t, &vp, &(reply->vps), PW_EAP_MESSAGE, 0, TAG_ANY);
+               pairfilter(t, &vp, &reply->vps, PW_EAP_MESSAGE, 0, TAG_ANY);
 
                /*
                 *      Handle EAP-MSCHAP-V2, where Access-Accept's
@@ -512,8 +512,7 @@ static int CC_HINT(nonnull) process_reply(eap_handler_t *handler, tls_session_t
                        pairdelete(&reply->vps, PW_MESSAGE_AUTHENTICATOR, 0, TAG_ANY);
 
                        rad_assert(!t->accept_vps);
-                       pairfilter(t, &t->accept_vps, &reply->vps,
-                                 0, 0, TAG_ANY);
+                       pairfilter(t, &t->accept_vps, &reply->vps, 0, 0, TAG_ANY);
                        rad_assert(!reply->vps);
                }
 
@@ -619,7 +618,7 @@ static int CC_HINT(nonnull) eappeap_postproxy(eap_handler_t *handler, void *data
 
                switch (rcode) {
                case RLM_MODULE_FAIL:
-                       talloc_free(&fake);
+                       talloc_free(fake);
                        eaptls_fail(handler, 0);
                        return 0;
 
@@ -816,12 +815,7 @@ rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
                        fake->server = t->soh_virtual_server;
                }
                RDEBUG("Sending SoH request to server %s", fake->server ? fake->server : "NULL");
-               debug_pair_list(fake->packet->vps);
-               RDEBUG("server %s {", fake->server);
                rad_virtual_server(fake);
-               RDEBUG("} # server %s", fake->server);
-               RDEBUG("Got SoH reply");
-               debug_pair_list(fake->reply->vps);
 
                if (fake->reply->code != PW_CODE_ACCESS_ACCEPT) {
                        RDEBUG2("SoH was rejected");
@@ -1117,8 +1111,8 @@ rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
                         *      Tell the original request that it's going
                         *      to be proxied.
                         */
-                       pairfilter(request, &(request->config_items),
-                                  &(fake->config_items),
+                       pairfilter(request, &request->config_items,
+                                  &fake->config_items,
                                   PW_PROXY_TO_REALM, 0, TAG_ANY);
 
                        /*
@@ -1167,7 +1161,6 @@ rlm_rcode_t eappeap_process(eap_handler_t *handler, tls_session_t *tls_session)
                                 *      So we associate the fake request with
                                 *      this request.
                                 */
-                               talloc_set_destructor(fake, request_opaque_free);
                                rcode = request_data_add(request, request->proxy,
                                                         REQUEST_DATA_EAP_MSCHAP_TUNNEL_CALLBACK,
                                                         fake, true);