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

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan 21 17:11:34 2011
New Revision: 303376

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303376
Log:
Temporarily revert r303288

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=303376&r1=303375&r2=303376
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jan 21 17:11:34 2011
@@ -17736,8 +17736,6 @@
 	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)) {