[asterisk-commits] kmoore: branch 11 r397034 - in /branches/11: ./ main/cel.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Aug 20 09:07:45 2013
New Revision: 397034

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397034
Log:
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

Modified:
    branches/11/   (props changed)
    branches/11/main/cel.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/cel.c?view=diff&rev=397034&r1=397033&r2=397034
==============================================================================
--- branches/11/main/cel.c (original)
+++ branches/11/main/cel.c Tue Aug 20 09:07:45 2013
@@ -310,7 +310,7 @@
 
 	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;
 	}