diff options
| author | Jason Parker <jparker@digium.com> | 2011-01-21 21:51:06 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-01-21 21:51:06 +0000 |
| commit | 4272837ead4558f4afa637e5eaae554bd8f31c0f (patch) | |
| tree | daa7c55f8da295ab37f9899db9a6b54e3199a815 | |
| parent | bad92a47856f8cac3ef0e91ea22c6644bfa2f3c3 (diff) | |
Merged revisions 303286 via svnmerge from
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
| -rw-r--r-- | channels/chan_dahdi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 4519294d6..53550e05d 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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)) { |