aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_dahdi.c
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-27 18:53:17 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-27 18:53:17 +0000
commitc6f2f57a607afafb19226e16756e67a3aa83739c (patch)
treea03509bf7a75f577930b39665fcd614b0b1960a8 /channels/chan_dahdi.c
parenta7da7536a194fb60e02cf8c4f8833ec96405c912 (diff)
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.1@259309 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r--channels/chan_dahdi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 7c467c669..f9e3134d3 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -9126,6 +9126,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;