From 89e7986ccbd16a92a3f75dd96a0f69eb55ba1d98 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Wed, 16 Apr 2008 17:30:09 +0000 Subject: [PATCH] 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 --- channels/chan_zap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 45ca1320e4..a0b69af1a6 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); -- 2.47.3