Merged revisions 317480 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317480 | russell | 2011-05-05 18:00:55 -0500 (Thu, 05 May 2011) | 8 lines

  Don't lose cdr_syslog config on a reload.

  (closes issue #18679)
  Reported by: enegaard
  Patches:
        issue18679_seanbright.patch uploaded by seanbright (license 71)
  Tested by: enegaard
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317481 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 6d9a6df..6354520 100644 (file)
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -264,8 +264,10 @@ static int reload(void)
                return AST_MODULE_LOAD_DECLINE;
        }
 
-       free_config();
-       res = load_config(1);
+       if ((res = load_config(1))) {
+               free_config();
+       }
+
        AST_RWLIST_UNLOCK(&sinks);
 
        return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;