[asterisk-commits] qwell: branch 1.4 r303284 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan 21 15:45:34 2011
New Revision: 303284

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303284
Log:
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.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=303284&r1=303283&r2=303284
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Fri Jan 21 15:45:34 2011
@@ -12580,6 +12580,9 @@
 	cfg = ast_config_load("users.conf");
 	if (cfg) {
 		char *cat;
+
+		/* Reset conf back to defaults, so values from chan_dahdi.conf don't leak in. */
+		conf = dahdi_chan_conf_default();
 		process_dahdi(&conf, "", ast_variable_browse(cfg, "general"), 1, 1);
 		for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
 			if (!strcasecmp(cat, "general"))