kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 303285 via svnmerge from

Browse Source 
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/branches/1.8@303286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2011-01-21 21:50:11 +00:00
parent 2cb2d0a837
commit c2aa3f8621
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_dahdi.c
View File

@@ -17652,6 +17652,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)) {