diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-06 16:39:25 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-06 16:39:25 +0000 |
| commit | a7dcb2983f713bba975050a3d4a6b66f16ef551f (patch) | |
| tree | 9aeb9f5da1961f3a77f9729fb84ba1f6e349f218 /channels/chan_dahdi.c | |
| parent | 1c7a0d6567fd676488bd618c4e471208037f3e8f (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@146698 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 67f7307bb..fc7cab08d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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"); |