]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Protect CEL from an invalid config on reload
authorKinsey Moore <kmoore@digium.com>
Tue, 20 Aug 2013 14:07:45 +0000 (14:07 +0000)
committerKinsey Moore <kmoore@digium.com>
Tue, 20 Aug 2013 14:07:45 +0000 (14:07 +0000)
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

main/cel.c

index 1c6616ad74f15f0bb49631c6d1edd48afed2076b..1ed111e1a89ae5232cdbb0b604e5b48da78d9364 100644 (file)
@@ -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;
        }