Merged revisions 146644 via svnmerge from

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

................
  r146644 | kpfleming | 2008-10-06 11:03:37 -0500 (Mon, 06 Oct 2008) | 15 lines
  
  Merged revisions 146643 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r146643 | kpfleming | 2008-10-06 10:57:49 -0500 (Mon, 06 Oct 2008) | 8 lines
    
    ensure that the private structure for pseudo channels is created without 'leaking' configuration data from other configured channels
    
    (closes issue #13555)
    Reported by: jeffg
    Patches:
          issue_13555.patch uploaded by kpfleming (license 421)
    Tested by: jeffg
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Kevin P. Fleming 17 years ago
parent 6f39424e5f
commit f100e6c659

@ -14545,14 +14545,13 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
/*< \todo why check for the pseudo in the per-channel section.
* Any actual use for manual setup of the pseudo channel? */
if (!found_pseudo && reload == 0) {
/* Make sure pseudo isn't a member of any groups if
we're automatically making it. */
confp->chan.group = 0;
confp->chan.callgroup = 0;
confp->chan.pickupgroup = 0;
/* use the default configuration for a channel, so
that any settings from real configured channels
don't "leak" into the pseudo channel config
*/
struct dahdi_chan_conf conf = dahdi_chan_conf_default();
tmp = mkintf(CHAN_PSEUDO, confp, NULL, reload);
tmp = mkintf(CHAN_PSEUDO, &conf, NULL, reload);
if (tmp) {
ast_verb(3, "Automatically generated pseudo channel\n");

Loading…
Cancel
Save