From: Corey Farrell <git@cfware.com>
Date: Tue, 5 May 2015 14:27:15 +0000 (-0400)
Subject: pbx_config: Register manager actions with module version of macro.
X-Git-Tag: 13.4.0-rc1~47^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69ae8cf0a4c441c1ebfab0da423cc1acfcc8c7aa;p=thirdparty%2Fasterisk.git

pbx_config: Register manager actions with module version of macro.

Switch manager actions in pbx_config to use the registration macro that
passes the module pointer, allowing pbx_config reference to be bumped
while the manager actions run.

ASTERISK-25061 #close
Reported by: Corey Farrell

Change-Id: I422c50dd74814616ac10c5e9c6598a0b1bc2c44e
---

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 79260bbadd..b036425047 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -2080,9 +2080,9 @@ static int load_module(void)
 		ast_cli_register(&cli_dialplan_save);
 	ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config));
 
-	res = ast_manager_register_xml_core(AMI_EXTENSION_ADD,
+	res = ast_manager_register_xml(AMI_EXTENSION_ADD,
 		EVENT_FLAG_SYSTEM, manager_dialplan_extension_add);
-	res |= ast_manager_register_xml_core(AMI_EXTENSION_REMOVE,
+	res |= ast_manager_register_xml(AMI_EXTENSION_REMOVE,
 		EVENT_FLAG_SYSTEM, manager_dialplan_extension_remove);
 
 	if (res) {