From: Nick Porter Date: Wed, 13 Nov 2024 14:21:51 +0000 (+0000) Subject: Not applicable in v4 as proxying is totally changed X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02b4d21755a37bc5ce49abc071cc01aa06d97b90;p=thirdparty%2Ffreeradius-server.git Not applicable in v4 as proxying is totally changed --- diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h index 11dc132484c..47f7af3bb6c 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h +++ b/src/modules/rlm_eap/types/rlm_eap_peap/eap_peap.h @@ -46,7 +46,6 @@ typedef struct { peap_status status; bool home_access_accept; int default_method; - bool proxy_tunneled_request_as_eap; CONF_SECTION *server_cs; peap_resumption session_resumption_state; } peap_tunnel_t; diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c index ea24a7e24c9..abca7b08acb 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c @@ -38,10 +38,7 @@ typedef struct { bool copy_request_to_tunnel; //!< Use SOME of the request attributes from outside of the //!< tunneled session in the tunneled request. -#ifdef WITH_PROXY - bool proxy_tunneled_request_as_eap; //!< Proxy tunneled session as EAP, or as de-capsulated - //!< protocol. -#endif + char const *virtual_server; //!< Virtual server for inner tunnel session. CONF_SECTION *server_cs; @@ -55,10 +52,6 @@ static conf_parser_t submodule_config[] = { { FR_CONF_DEPRECATED("use_tunneled_reply", rlm_eap_peap_t, NULL), .dflt = "no" }, -#ifdef WITH_PROXY - { FR_CONF_OFFSET("proxy_tunneled_request_as_eap", rlm_eap_peap_t, proxy_tunneled_request_as_eap), .dflt = "yes" }, -#endif - { FR_CONF_OFFSET_FLAGS("virtual_server", CONF_FLAG_REQUIRED | CONF_FLAG_NOT_EMPTY, rlm_eap_peap_t, virtual_server) }, { FR_CONF_OFFSET("require_client_cert", rlm_eap_peap_t, req_client_cert), .dflt = "no" }, @@ -102,9 +95,6 @@ static peap_tunnel_t *peap_alloc(TALLOC_CTX *ctx, rlm_eap_peap_t *inst) t = talloc_zero(ctx, peap_tunnel_t); -#ifdef WITH_PROXY - t->proxy_tunneled_request_as_eap = inst->proxy_tunneled_request_as_eap; -#endif t->server_cs = inst->server_cs; t->session_resumption_state = PEAP_RESUMPTION_MAYBE;