From c0d6ba8fdc843002148a3ff988c0543b35e719dd Mon Sep 17 00:00:00 2001 From: rmudgett Date: Tue, 27 Apr 2010 19:03:04 +0000 Subject: Merged revisions 259307 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue #7321 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue #17143) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@259310 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 1 + 1 file changed, 1 insertion(+) (limited to 'channels') diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d20fc07bf..84edbf27d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -10444,6 +10444,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->adsi = conf->chan.adsi; tmp->use_smdi = conf->chan.use_smdi; tmp->permhidecallerid = conf->chan.hidecallerid; + tmp->hidecalleridname = conf->chan.hidecalleridname; tmp->callreturn = conf->chan.callreturn; tmp->echocancel = conf->chan.echocancel; tmp->echotraining = conf->chan.echotraining; -- cgit v1.2.3