From a27555687b4975dae714a88c688ab9d5dbd04ed4 Mon Sep 17 00:00:00 2001 From: Richard Mudgett <rmudgett@digium.com> Date: Wed, 14 Sep 2011 16:05:38 +0000 Subject: [PATCH] Merged revisions 335852 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r335852 | rmudgett | 2011-09-14 11:00:37 -0500 (Wed, 14 Sep 2011) | 18 lines Merged revisions 335851 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r335851 | rmudgett | 2011-09-14 10:53:25 -0500 (Wed, 14 Sep 2011) | 11 lines Fixed cut-n-paste regression using the wrong variable. Fixes the missing DAHDI channels when using the newer chan_dahdi.conf sections for channel configuration. (closes issue ASTERISK-18496) Reported by: Sean Darcy Patches: jira_asterisk_18496_v1.8.patch (license #5621) patch uploaded by rmudgett Tested by: Sean Darcy, rmudgett ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335853 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 695ebf4ec6..a235eaa1c0 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -18381,7 +18381,7 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *default_conf, str continue; } - chans = ast_variable_retrieve(ucfg, cat, "dahdichan"); + chans = ast_variable_retrieve(cfg, cat, "dahdichan"); if (ast_strlen_zero(chans)) { /* Section is useless without a dahdichan value present. */ continue; -- GitLab