[asterisk-commits] qwell: branch 1.4 r114173 - /branches/1.4/channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Apr 16 12:30:09 2008
New Revision: 114173

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114173
Log:
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)

Modified:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=114173&r1=114172&r2=114173
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Wed Apr 16 12:30:09 2008
@@ -11367,11 +11367,10 @@
 				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);