summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2011-01-21 23:11:34 +0000
committerJason Parker <jparker@digium.com>2011-01-21 23:11:34 +0000
commit95f5dc66449c467516a18ca4a0a749bb7496b8d6 (patch)
treeb8f57398eda3cba0b944a5316318fa048e8b4c8d /channels
parent4272837ead4558f4afa637e5eaae554bd8f31c0f (diff)
Temporarily revert r303288
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_dahdi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 53550e05d..4519294d6 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -17736,8 +17736,6 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *base_conf, struct
if (ucfg) {
const char *chans;
- /* Reset conf back to defaults, so values from chan_dahdi.conf don't leak in. */
- base_conf = dahdi_chan_conf_default();
process_dahdi(base_conf, "", ast_variable_browse(ucfg, "general"), 1, 0);
for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {