aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-19 17:52:52 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-19 17:52:52 +0000
commitcedc02cca9da4469f7f4c20ceb812704814dbf9a (patch)
tree741c5eddf5282546b8f00886016a47b23bb9704f /main
parent8c0ce170c80f69d548d5b907ec81b6e74b35e17c (diff)
Remove the use of RTLD_NOLOAD, as it is not behaving like expected.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@183241 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/loader.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/main/loader.c b/main/loader.c
index 60c8a7676..c579b3af4 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -386,18 +386,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
return NULL;
}
- /* if the system supports RTLD_NOLOAD, we can just 'promote' the flags
- on the already-opened library to what we want... if not, we have to
- close it and start over
- */
-#if defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__)
- if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) {
- ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror());
- while (!dlclose(lib));
- free(resource_being_loaded);
- return NULL;
- }
-#else
while (!dlclose(lib));
resource_being_loaded = NULL;
@@ -417,7 +405,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
/* since the module was successfully opened, and it registered itself
the previous time we did that, we're going to assume it worked this
time too :) */
-#endif
AST_LIST_LAST(&module_list)->lib = lib;
resource_being_loaded = NULL;