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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@303285 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 9f9678d5b29ed2578c22053086dad20d0314092c..da01d595af9efaf55e4eeccf94f5eb8ec6e6342b 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -17593,6 +17593,8 @@ static int setup_dahdi(int reload)
        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)) {