[asterisk-commits] qwell: trunk r303288 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan 21 15:51:06 2011
New Revision: 303288

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

................
  r303286 | qwell | 2011-01-21 15:50:11 -0600 (Fri, 21 Jan 2011) | 22 lines
  
  Merged revisions 303285 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r303285 | qwell | 2011-01-21 15:48:09 -0600 (Fri, 21 Jan 2011) | 15 lines
    
    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:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=303288&r1=303287&r2=303288
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jan 21 15:51:06 2011
@@ -17736,6 +17736,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)) {