From: Joshua Colp <jcolp@digium.com>
Date: Mon, 22 Jan 2018 16:33:18 +0000 (-0600)
Subject: Merge "loader: Remove global symbol only startup phase."
X-Git-Tag: 16.0.0-rc1~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=908e39f186b20be766df57013a65d6ccf31632df;p=thirdparty%2Fasterisk.git

Merge "loader: Remove global symbol only startup phase."
---

908e39f186b20be766df57013a65d6ccf31632df
diff --cc main/loader.c
index 44614e9899,7e629caae2..c024dab935
--- a/main/loader.c
+++ b/main/loader.c
@@@ -1436,20 -1428,12 +1420,12 @@@ static enum ast_module_load_result load
  
  	if ((mod = find_resource(resource_name, 0))) {
  		if (mod->flags.running) {
 -			ast_log(LOG_WARNING, "Module '%s' already exists.\n", resource_name);
 +			ast_log(LOG_WARNING, "Module '%s' already loaded and running.\n", resource_name);
  			return AST_MODULE_LOAD_DECLINE;
  		}
- 		if (global_symbols_only && !ast_test_flag(mod->info, AST_MODFLAG_GLOBAL_SYMBOLS))
- 			return AST_MODULE_LOAD_SKIP;
  	} else {
- 		mod = load_dynamic_module(resource_name, global_symbols_only, suppress_logging);
- 		if (mod == MODULE_LOCAL_ONLY) {
- 				return AST_MODULE_LOAD_SKIP;
- 		}
+ 		mod = load_dynamic_module(resource_name, suppress_logging);
  		if (!mod) {
- 			if (!global_symbols_only) {
- 				ast_log(LOG_WARNING, "Module '%s' could not be loaded.\n", resource_name);
- 			}
  			return required ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_DECLINE;
  		}