int can_free;
CONF_SECTION *cs;
rbtree_t *components;
+ modcallable *mc[RLM_COMPONENT_COUNT];
+ CONF_SECTION *subcs[RLM_COMPONENT_COUNT];
struct virtual_server_t *next;
} virtual_server_t;
static rbtree_t *instance_tree = NULL;
-typedef struct section_type_value_t {
- const char *section;
- const char *typename;
- int attr;
-} section_type_value_t;
-
struct fr_module_hup_t {
module_instance_t *mi;
time_t when;
};
+typedef struct section_type_value_t {
+ const char *section;
+ const char *typename;
+ int attr;
+} section_type_value_t;
+
/*
* Ordered by component
*/
{ "session", "Session-Type", PW_SESSION_TYPE },
{ "pre-proxy", "Pre-Proxy-Type", PW_PRE_PROXY_TYPE },
{ "post-proxy", "Post-Proxy-Type", PW_POST_PROXY_TYPE },
- { "post-auth", "Post-Auth-Type", PW_POST_AUTH_TYPE },
+ { "post-auth", "Post-Auth-Type", PW_POST_AUTH_TYPE }
+#ifdef WITH_COA
+ ,
+ { "recv-coa", "Recv-CoA-Type", PW_RECV_COA_TYPE },
+ { "send-coa", "Send-CoA-Type", PW_SEND_COA_TYPE }
+#endif
};
#ifdef WITHOUT_LIBLTDL
+#ifdef WITH_DLOPEN
+#include <dlfcn.h>
+
+#ifndef RTLD_NOW
+#define RTLD_NOW (0)
+#endif
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL (0)
+#endif
+
+#define fr_dlopenext lt_dlopenext
+#ifndef LT_SHREXT
+#ifdef __APPLE__
+#define LT_SHREXT ".so"
+#elif defined (WIN32)
+#define LT_SHREXT ".dll"
+#else
+#define LT_SHREXT ".dylib"
+#endif
+#endif
+
+lt_dlhandle lt_dlopenext(const char *name)
+{
+ char buffer[256];
+
+ strlcpy(buffer, name, sizeof(buffer));
+
+ /*
+ * FIXME: Make this configurable...
+ */
+ strlcat(buffer, LT_SHREXT, sizeof(buffer));
+
+ return dlopen(buffer, RTLD_NOW | RTLD_LOCAL);
+}
+
+void *lt_dlsym(lt_dlhandle handle, UNUSED const char *symbol)
+{
+ return dlsym(handle, symbol);
+}
+
+int lt_dlclose(lt_dlhandle handle)
+{
+ if (!handle) return 0;
+
+ return dlclose(handle);
+}
+
+const char *lt_dlerror(void)
+{
+ return dlerror();
+}
+
+
+#else /* without dlopen */
typedef struct lt_dlmodule_t {
const char *name;
void *ref;
} lt_dlmodule_t;
+typedef struct eap_type_t EAP_TYPE;
+typedef struct rlm_sql_module_t rlm_sql_module_t;
+
/*
- * Define modules here.
+ * FIXME: Write hackery to auto-generate this data.
+ * We only need to do this on systems that don't have dlopen.
*/
extern module_t rlm_pap;
extern module_t rlm_chap;
extern module_t rlm_eap;
+extern module_t rlm_sql;
+/* and so on ... */
-/*
- * EAP structures are defined elsewhere.
- */
-typedef struct eap_type_t EAP_TYPE;
-
-/*
- * And so on for other EAP types.
- */
extern EAP_TYPE rlm_eap_md5;
+extern rlm_sql_module_t rlm_sql_mysql;
+/* and so on ... */
static const lt_dlmodule_t lt_dlmodules[] = {
{ "rlm_pap", &rlm_pap },
{ "rlm_chap", &rlm_chap },
{ "rlm_eap", &rlm_eap },
+ /* and so on ... */
+
{ "rlm_eap_md5", &rlm_eap_md5 },
-
- /*
- * Add other modules here.
- */
+ /* and so on ... */
+
+ { "rlm_sql_mysql", &rlm_sql_mysql },
+ /* and so on ... */
{ NULL, NULL }
};
-
+#define fr_dlopenext lt_dlopenext
lt_dlhandle lt_dlopenext(const char *name)
{
int i;
{
return handle;
}
+
+int lt_dlclose(lt_dlhandle handle)
+{
+ return 0;
+}
+
+const char *lt_dlerror(void)
+{
+ return "Unspecified error";
+}
+
+#endif /* WITH_DLOPEN */
+#else /* WITHOUT_LIBLTDL */
+
+/*
+ * Solve the issues of libraries linking to other libraries
+ * by using a newer libltdl API.
+ */
+#ifndef HAVE_LT_DLADVISE_INIT
+#define fr_dlopenext lt_dlopenext
+#else
+static lt_dlhandle fr_dlopenext(const char *filename)
+{
+ lt_dlhandle handle = 0;
+ lt_dladvise advise;
+
+ if (!lt_dladvise_init (&advise) &&
+ !lt_dladvise_ext (&advise) &&
+ !lt_dladvise_global (&advise)) {
+ handle = lt_dlopenadvise (filename, advise);
+ }
+
+ lt_dladvise_destroy (&advise);
+
+ return handle;
+}
+#endif /* HAVE_LT_DLADVISE_INIT */
#endif /* WITHOUT_LIBLTDL */
static int virtual_server_idx(const char *name)
{
module_entry_t myentry;
module_entry_t *node;
- lt_dlhandle handle;
+ lt_dlhandle handle = NULL;
char module_struct[256];
char *p;
const module_t *module;
if (node) return node;
/*
- * Keep the handle around so we can dlclose() it.
- */
- handle = lt_dlopenext(module_name);
- if (handle == NULL) {
- cf_log_err(cf_sectiontoitem(cs),
- "Failed to link to module '%s': %s\n",
- module_name, lt_dlerror());
- return NULL;
- }
-
- /*
* Link to the module's rlm_FOO{} module structure.
*
* The module_name variable has the version number
p = strrchr(module_struct, '-');
if (p) *p = '\0';
+#if defined(WITHOUT_LIBLTDL) && defined (WITH_DLOPEN) && defined(RTLD_SELF)
+ module = lt_dlsym(RTLD_SELF, module_struct);
+ if (module) goto open_self;
+#endif
+
+ /*
+ * Keep the handle around so we can dlclose() it.
+ */
+ handle = fr_dlopenext(module_name);
+ if (handle == NULL) {
+ cf_log_err(cf_sectiontoitem(cs),
+ "Failed to link to module '%s': %s\n",
+ module_name, lt_dlerror());
+ return NULL;
+ }
+
DEBUG3(" (Loaded %s, checking if it's valid)", module_name);
/*
lt_dlclose(handle);
return NULL;
}
+
+#if defined(WITHOUT_LIBLTDL) && defined (WITH_DLOPEN) && defined(RTLD_SELF)
+ open_self:
+#endif
/*
* Before doing anything else, check if it's sane.
*/
{
int check_config_safe = FALSE;
CONF_SECTION *cs;
- const char *name1, *name2;
+ const char *name1;
module_instance_t *node, myNode;
char module_name[256];
if (!do_link) return NULL;
name1 = cf_section_name1(cs);
- name2 = cf_section_name2(cs);
/*
* Found the configuration entry.
} else {
print_inst:
check_config_safe = TRUE;
- cf_log_module(cs, "Instantiating %s", instname);
+ cf_log_module(cs, "Instantiating module \"%s\" from file %s",
+ instname, cf_section_filename(cs));
}
/*
int indexed_modcall(int comp, int idx, REQUEST *request)
{
int rcode;
- indexed_modcallable *this;
modcallable *list = NULL;
virtual_server_t *server;
+ /*
+ * Hack to find the correct virtual server.
+ */
rcode = virtual_server_idx(request->server);
for (server = virtual_servers[rcode];
server != NULL;
}
if (!server) {
- RDEBUG("No such virtual server %s", request->server);
+ RDEBUG("No such virtual server \"%s\"", request->server);
return RLM_MODULE_FAIL;
}
- this = lookup_by_index(server->components, comp, idx);
- if (!this) {
- if (idx != 0) DEBUG2(" WARNING: Unknown value specified for %s. Cannot perform requested action.",
- section_type_value[comp].typename);
+ if (idx == 0) {
+ list = server->mc[comp];
+ if (!list) RDEBUG2(" WARNING: Empty %s section. Using default return values.", section_type_value[comp].section);
+
} else {
- list = this->modulelist;
- }
+ indexed_modcallable *this;
+ this = lookup_by_index(server->components, comp, idx);
+ if (this) {
+ list = this->modulelist;
+ } else {
+ RDEBUG2(" WARNING: Unknown value specified for %s. Cannot perform requested action.",
+ section_type_value[comp].typename);
+ }
+ }
+
+ if (server->subcs[comp]) {
+ if (idx == 0) {
+ RDEBUG("# Executing section %s from file %s",
+ section_type_value[comp].section,
+ cf_section_filename(server->subcs[comp]));
+ } else {
+ RDEBUG("# Executing group from file %s",
+ cf_section_filename(server->subcs[comp]));
+ }
+ }
request->component = section_type_value[comp].section;
rcode = modcall(comp, list, request);
request->module = "";
- request->component = "";
+ request->component = "<core>";
return rcode;
}
* automatically. If it isn't found, it's a serious
* error.
*/
- dval = dict_valbyname(attr, name2);
+ dval = dict_valbyname(attr, 0, name2);
if (!dval) {
cf_log_err(cf_sectiontoitem(cs),
"%s %s Not previously configured",
* If the value already exists, don't
* create it again.
*/
- dval = dict_valbyname(dattr->attr, name);
+ dval = dict_valbyname(dattr->attr, dattr->vendor, name);
if (dval) return 1;
/*
*/
do {
value = fr_rand() & 0x00ffffff;
- } while (dict_valbyattr(dattr->attr, value));
+ } while (dict_valbyattr(dattr->attr, dattr->vendor, value));
if (dict_addvalue(name, dattr->name, value) < 0) {
radlog(L_ERR, "%s", fr_strerror());
/*
* Find the attribute used to store VALUEs for this section.
*/
- dattr = dict_attrbyvalue(section_type_value[comp].attr);
+ dattr = dict_attrbyvalue(section_type_value[comp].attr, 0);
if (!dattr) {
cf_log_err(cf_sectiontoitem(cs),
"No such attribute %s",
}
}
- dval = dict_valbyname(PW_AUTH_TYPE, modrefname);
+ dval = dict_valbyname(PW_AUTH_TYPE, 0, modrefname);
if (!dval) {
/*
* It's a section, but nothing we
const char *name = cf_section_name2(cs);
rbtree_t *components;
virtual_server_t *server = NULL;
+ indexed_modcallable *c;
if (name) {
- cf_log_info(cs, "server %s {", name);
+ cf_log_info(cs, "server %s { # from file %s",
+ name, cf_section_filename(cs));
} else {
- cf_log_info(cs, "server {");
+ cf_log_info(cs, "server { # from file %s",
+ cf_section_filename(cs));
}
cf_log_info(cs, " modules {");
/*
* Find the attribute used to store VALUEs for this section.
*/
- dattr = dict_attrbyvalue(section_type_value[comp].attr);
+ dattr = dict_attrbyvalue(section_type_value[comp].attr, 0);
if (!dattr) {
cf_log_err(cf_sectiontoitem(subcs),
"No such attribute %s",
section_type_value[comp].typename);
error:
- cf_log_info(cs, " } # modules");
- cf_log_info(cs, "} # server");
if (debug_flag == 0) {
radlog(L_ERR, "Failed to load virtual server %s",
(name != NULL) ? name : "<default>");
if (strcmp(name1, section_type_value[comp].typename) == 0) {
if (!define_type(dattr,
cf_section_name2(subsubcs))) {
- cf_log_info(cs, " }");
goto error;
}
}
* proxying.
*/
if (!mainconfig.proxy_requests &&
- ((comp == PW_PRE_PROXY_TYPE) ||
- (comp == PW_PRE_PROXY_TYPE))) {
+ ((comp == RLM_COMPONENT_PRE_PROXY) ||
+ (comp == RLM_COMPONENT_POST_PROXY))) {
continue;
}
#endif
if (load_component_section(subcs, components, comp) < 0) {
- cf_log_info(cs, " }");
goto error;
}
+
+ /*
+ * Cache a default, if it exists. Some people
+ * put empty sections for some reason...
+ */
+ c = lookup_by_index(components, comp, 0);
+ if (c) server->mc[comp] = c->modulelist;
+
+ server->subcs[comp] = subcs;
+
flag = 1;
} /* loop over components */
RLM_COMPONENT_POST_AUTH) < 0) {
goto error;
}
+ c = lookup_by_index(components,
+ RLM_COMPONENT_POST_AUTH, 0);
+ if (c) server->mc[RLM_COMPONENT_POST_AUTH] = c->modulelist;
flag = 1;
}
const DICT_ATTR *dattr;
dattr = dict_attrbyname("DHCP-Message-Type");
- if (!dattr) {
- radlog(L_ERR, "No DHCP-Message-Type attribute");
- goto error;
- }
/*
* Handle each DHCP Message type separately.
*/
- for (subcs = cf_subsection_find_next(cs, NULL,
- "dhcp");
- subcs != NULL;
- subcs = cf_subsection_find_next(cs, subcs,
- "dhcp")) {
+ if (dattr) for (subcs = cf_subsection_find_next(cs, NULL, "dhcp");
+ subcs != NULL;
+ subcs = cf_subsection_find_next(cs, subcs,
+ "dhcp")) {
const char *name2 = cf_section_name2(subcs);
DEBUG2(" Module: Checking dhcp %s {...} for more modules to load", name2);
RLM_COMPONENT_POST_AUTH)) {
goto error; /* FIXME: memleak? */
}
+ c = lookup_by_index(components,
+ RLM_COMPONENT_POST_AUTH, 0);
+ if (c) server->mc[RLM_COMPONENT_POST_AUTH] = c->modulelist;
flag = 1;
}
}
*/
if (!reload) {
/*
+ * This line works around a completely
+ *
+ * RIDICULOUS INSANE IDIOTIC
+ *
+ * bug in libltdl on certain systems. The "set
+ * preloaded symbols" macro below ends up
+ * referencing this name, but it isn't defined
+ * anywhere in the libltdl source. As a result,
+ * any program STUPID enough to rely on libltdl
+ * fails to link, because the symbol isn't
+ * defined anywhere.
+ *
+ * It's like libtool and libltdl are some kind
+ * of sick joke.
+ */
+#ifdef IE_LIBTOOL_DIE
+#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
+#endif
+
+ /*
* Set the default list of preloaded symbols.
* This is used to initialize libltdl's list of
* preloaded modules.
listener = listener->next) {
char buffer[256];
+#ifdef WITH_PROXY
if (listener->type == RAD_LISTEN_PROXY) continue;
+#endif
cs = cf_section_sub_find_name2(config,
"server", listener->server);
{
return indexed_modcall(RLM_COMPONENT_POST_AUTH, postauth_type, request);
}
+
+#ifdef WITH_COA
+int module_recv_coa(int recv_coa_type, REQUEST *request)
+{
+ return indexed_modcall(RLM_COMPONENT_RECV_COA, recv_coa_type, request);
+}
+
+int module_send_coa(int send_coa_type, REQUEST *request)
+{
+ return indexed_modcall(RLM_COMPONENT_SEND_COA, send_coa_type, request);
+}
+#endif
projects / freeradius.git / blobdiff