diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-21 21:48:09 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-21 21:48:09 +0000 |
| commit | 49c10c4e9fbd3f576e140a5e67860b95d9ccb300 (patch) | |
| tree | 735e744ec0333f89cd6c355548c048ba01ee6aba /channels | |
| parent | 9a835514d951e79b5f271e704f6287eae997d849 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@303285 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 9f9678d5b..da01d595a 100644 --- 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)) { |