Skip to content

Commit

Permalink
Remove support for statically compiled EAP methods Closes #1591
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed Apr 26, 2016
1 parent 4de73a2 commit cf9cda6
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/modules/rlm_eap/eap.c
Expand Up @@ -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
*/
Expand All @@ -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);

/*
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit cf9cda6

Please sign in to comment.