diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-13 19:04:41 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-13 19:04:41 +0000 |
| commit | 0e2a9d07aca94409726c1fa34eda9586fd99e176 (patch) | |
| tree | e746e82f756d2c6c2309f1df4c61af41f9d5b1d6 /apps/app_confbridge.c | |
| parent | cc06020f23fd175061a65a36c8b6809feca0cc18 (diff) | |
app_confbridge: Fix memory leak on reload.
The config framework options should not be registered multiple times.
Instead the configuration just needs to be reprocessed by the config
framework.
........
Merged revisions 391700 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 96ef12460..8919b7e24 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -3142,7 +3142,7 @@ static int load_module(void) { int res = 0; - if (conf_load_config(0)) { + if (conf_load_config()) { ast_log(LOG_ERROR, "Unable to load config. Not loading module.\n"); return AST_MODULE_LOAD_DECLINE; } @@ -3191,7 +3191,7 @@ static int load_module(void) static int reload(void) { - return conf_load_config(1); + return conf_reload_config(); } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Conference Bridge Application", |