From 17aa64c20e961777e8e9768a951435868b8b1971 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 1 Oct 2012 16:12:43 +0000
Subject: [PATCH] Don't destroy confbridge config when error is encountered
during a reload.
Not panicking means that the old config is kept.
(closes issue ASTERISK-20458)
Reported by: Leif Madsen
Patches:
ASTERISK-20458.patch uploaded by Mark Michelson(license #5049)
Tested by Leif Madsen
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@374106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/confbridge/conf_config_parser.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index f4a9604107..1286914582 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -1316,7 +1316,10 @@ int conf_load_config(int reload)
return 0;
error:
- conf_destroy_config();
+ /* On a reload, just keep the config we already have in place. */
+ if (!reload) {
+ conf_destroy_config();
+ }
return -1;
}
--
GitLab