[svn-commits] kpfleming: branch 1.4 r146643 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Oct  6 10:57:49 2008
New Revision: 146643

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146643
Log:
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

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=146643&r1=146642&r2=146643
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Mon Oct  6 10:57:49 2008
@@ -11650,14 +11650,13 @@
 	/*< \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;
-
-		tmp = mkintf(CHAN_PSEUDO, confp, NULL, reload);
+		/* 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, &conf, NULL, reload);
 
 		if (tmp) {
 			if (option_verbose > 2)