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

(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
1.4
Jason Parker 18 years ago
parent c99280a59e
commit 89e7986ccb

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

Loading…
Cancel
Save