[asterisk-commits] qwell: branch 1.8 r303375 - in /branches/1.8: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan 21 17:11:02 2011
New Revision: 303375

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

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

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

Modified: branches/1.8/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_dahdi.c?view=diff&rev=303375&r1=303374&r2=303375
==============================================================================
--- branches/1.8/channels/chan_dahdi.c (original)
+++ branches/1.8/channels/chan_dahdi.c Fri Jan 21 17:11:02 2011
@@ -17652,8 +17652,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)) {