[asterisk-commits] mattf: trunk r40981 - /trunk/main/loader.c

[asterisk-commits at lists.digium.com]

Author: mattf
Date: Thu Aug 24 12:24:33 2006
New Revision: 40981

URL: http://svn.digium.com/view/asterisk?rev=40981&view=rev
Log:
Revert stupid RTLD_NOLOAD change that breaks module loading on some systems.

Modified:
    trunk/main/loader.c

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?rev=40981&r1=40980&r2=40981&view=diff
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Thu Aug 24 12:24:33 2006
@@ -387,14 +387,6 @@
 	   on the already-opened library to what we want... if not, we have to
 	   close it and start over
 	*/
-#if HAVE_RTLD_NOLOAD
-	if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_GLOBAL : RTLD_NOW))) {
-		ast_log(LOG_WARNING, "%s\n", dlerror());
-		while (!dlclose(lib));
-		free(resource_being_loaded);
-		return NULL;
-	}
-#else
 	while (!dlclose(lib));
 	resource_being_loaded = NULL;
 
@@ -414,7 +406,6 @@
 	/* 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;