kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general.

Browse Source 
(closes issue #12458)
Reported by: tzafrir
Patches:
      chanzap_users_sections.diff uploaded by tzafrir (license 46)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-04-16 17:30:09 +00:00
parent c99280a59e
commit 89e7986ccb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/chan_zap.c
View File

@@ -11367,11 +11367,10 @@ static int setup_zap(int reload)
continue;
chans = ast_variable_retrieve(cfg, cat, "zapchan");
if (!ast_strlen_zero(chans)) {
/** \todo At this point we should probably
* duplicate conf, and pass a copy, to prevent
* one section from affecting another
*/
process_zap(&conf, ast_variable_browse(cfg, cat), reload, 0);
struct zt_chan_conf sect_conf;
memcpy(&sect_conf, &conf, sizeof(sect_conf));
process_zap(&sect_conf, ast_variable_browse(cfg, cat), reload, 0);
}
}
ast_config_destroy(cfg);