From: Kinsey Moore Date: Tue, 20 Aug 2013 14:07:45 +0000 (+0000) Subject: Protect CEL from an invalid config on reload X-Git-Tag: 11.6.0-rc1~3^2~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e1be72421986f5f25f00048bf4406658e22ab2a;p=thirdparty%2Fasterisk.git Protect CEL from an invalid config on reload This patch fixes CEL to properly handle an invalid config on reload. (closes issue ASTERISK-22259) Reported by: Corey Farrell Tested by: Corey Farrell Patches: cel-config.patch uploaded by Corey Farrell ........ Merged revisions 397033 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@397034 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/cel.c b/main/cel.c index 1c6616ad74..1ed111e1a8 100644 --- a/main/cel.c +++ b/main/cel.c @@ -310,7 +310,7 @@ static int do_reload(void) config = ast_config_load2("cel.conf", "cel", config_flags); - if (config == CONFIG_STATUS_FILEMISSING) { + if (config == CONFIG_STATUS_FILEMISSING || config == CONFIG_STATUS_FILEUNCHANGED || config == CONFIG_STATUS_FILEINVALID) { config = NULL; goto return_cleanup; }