From: Arran Cudbard-Bell Date: Tue, 26 Apr 2016 15:27:34 +0000 (-0400) Subject: Remove support for statically compiled EAP methods Closes #1591 X-Git-Tag: release_3_0_12~149 X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=cf9cda6bb29b00621a505b8d98a0b0257e3f4e76;p=freeradius.git Remove support for statically compiled EAP methods Closes #1591 --- diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c index 2c21f67..69060f2 100644 --- a/src/modules/rlm_eap/eap.c +++ b/src/modules/rlm_eap/eap.c @@ -122,11 +122,6 @@ int eap_module_instantiate(rlm_eap_t *inst, eap_module_t **m_inst, eap_type_t nu p++; } -#if defined(HAVE_DLFCN_H) && defined(RTLD_SELF) - method->type = dlsym(RTLD_SELF, mod_name); - if (method->type) goto open_self; -#endif - /* * Link the loaded EAP-Type */ @@ -145,9 +140,6 @@ int eap_module_instantiate(rlm_eap_t *inst, eap_module_t **m_inst, eap_type_t nu return -1; } -#if !defined(WITH_LIBLTDL) && defined(HAVE_DLFCN_H) && defined(RTLD_SELF) -open_self: -#endif cf_log_module(cs, "Linked to sub-module %s", mod_name); /* @@ -371,7 +363,7 @@ eap_rcode_t eap_method_select(rlm_eap_t *inst, eap_handler_t *handler) * parent. If the outer session exists, and doesn't have * a home server, then it's multiple layers of tunneling. */ - if (handler->request->parent && + if (handler->request->parent && handler->request->parent->parent && !handler->request->parent->parent->home_server) { RERROR("Multiple levels of TLS nesting are invalid");