Merged revisions 208383 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r208383 | jpeeler | 2009-07-23 14:21:50 -0500 (Thu, 23 Jul 2009) | 12 lines

  Merged revisions 208380 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r208380 | jpeeler | 2009-07-23 14:19:53 -0500 (Thu, 23 Jul 2009) | 6 lines

    Only set the priindication setting when not performing a reload

    (closes issue #14696)
    Reported by: fdecher
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@208384 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 1d67ed5ae26410f39026d424e2c1df98915768a8..daa2841e2bc2126b6d52e2fb1b30706ec64e7b08 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -8566,6 +8566,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                for (x = 0; x < 3; x++)
                        tmp->subs[x].dfd = -1;
                tmp->channel = channel;
+               tmp->priindication_oob = conf->chan.priindication_oob;
        }
 
        if (tmp) {
@@ -8926,7 +8927,6 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
                tmp->dahditrcallerid = conf->chan.dahditrcallerid;
                tmp->restrictcid = conf->chan.restrictcid;
                tmp->use_callingpres = conf->chan.use_callingpres;
-               tmp->priindication_oob = conf->chan.priindication_oob;
                tmp->priexclusive = conf->chan.priexclusive;
                if (tmp->usedistinctiveringdetection) {
                        if (!tmp->use_callerid) {