Merged revisions 303286 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 21:51:06 +0000 (21:51 +0000)
committerJason Parker <jparker@digium.com>
Fri, 21 Jan 2011 21:51:06 +0000 (21:51 +0000)
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
    ........
  ................
................

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

channels/chan_dahdi.c

index 4519294..53550e0 100644 (file)
@@ -17736,6 +17736,8 @@ static int setup_dahdi_int(int reload, struct dahdi_chan_conf *base_conf, struct
        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)) {