[asterisk-commits] qwell: branch 1.6.2 r303285 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan 21 15:48:09 2011
New Revision: 303285

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303285
Log:
Merged revisions 303284 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines
  
  Reset configuration before parsing users.conf.
  
  Some values configured in chan_dahdi.conf were able to leak in to users.conf
  configuration.  This was surprising users, and potentially setting non-sane
  "defaults".
  
  ASTNOW-125
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=303285&r1=303284&r2=303285
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Fri Jan 21 15:48:09 2011
@@ -17593,6 +17593,8 @@
 	if (ucfg) {
 		const char *chans;
 
+		/* Reset conf back to defaults, so values from chan_dahdi.conf don't leak in. */
+		base_conf = dahdi_chan_conf_default();
 		process_dahdi(&base_conf, "", ast_variable_browse(ucfg, "general"), 1, 0);
 
 		for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) {