diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-16 17:30:09 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-16 17:30:09 +0000 |
| commit | 508945486eb569cd4bb041d047a6baeaaa0af622 (patch) | |
| tree | 27c4bb231e7e137ade61868a9c672a1097e3499a /channels | |
| parent | b6a493e74e28a57944abdc557017d6fa2ae9544c (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@114173 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 45ca1320e..a0b69af1a 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -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(§_conf, &conf, sizeof(sect_conf)); + + process_zap(§_conf, ast_variable_browse(cfg, cat), reload, 0); } } ast_config_destroy(cfg); |