Skip to content
Snippets Groups Projects
Commit 07481baa authored by Joshua Colp's avatar Joshua Colp
Browse files

cel_manager: Don't crash if configuration file is invalid.

The cel_manager module did not properly handle the case where the
configuration file was invalid. The module will now output a warning
message and disable itself if this occurs.

Reported by: Bryan Walters
........

Merged revisions 405581 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 405582 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 405583 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 7cbb6eab
No related branches found
No related tags found
No related merge requests found
......@@ -153,7 +153,12 @@ static int load_config(int reload)
return 0;
}
if (!cfg) {
if (cfg == CONFIG_STATUS_FILEINVALID) {
ast_log(LOG_WARNING, "Configuration file '%s' is invalid. CEL manager Module not activated.\n",
CONF_FILE);
enablecel = 0;
return -1;
} else if (!cfg) {
ast_log(LOG_WARNING, "Failed to load configuration file. CEL manager Module not activated.\n");
enablecel = 0;
return -1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment