From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 17 Jul 2009 17:04:00 +0000 (+0000)
Subject: Blocked revisions 206998 via svnmerge
X-Git-Tag: 1.6.1.3-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e926be2312d6c6de75fbc49ef71c89a56af102d0;p=thirdparty%2Fasterisk.git

Blocked revisions 206998 via svnmerge

........
  r206998 | jpeeler | 2009-07-17 12:02:44 -0500 (Fri, 17 Jul 2009) | 14 lines

  Fix segfault in sig_analog when using callwaiting, respect callwaiting options

  Sig_analog handles allocating the sub channel for callwaiting, so no longer try
  to do it in chan_dahdi. Modified analog_alloc_sub to only mark the sub as
  allocated upon success of the alloc_sub callback, which was responsible for the
  segfault. Also, the callwaiting and callwaitingcallerid options were being
  unconditionally set to true. Now, the options are properly set from
  chan_dahdi.conf.

  (closes issue #15508)
  Reported by: elguero
  Tested by: elguero
........


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