[svn-commits] tilghman: branch 1.6.1 r244507 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Feb  3 12:43:37 2010
New Revision: 244507

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=244507
Log:
Merged revisions 244505 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r244505 | tilghman | 2010-02-03 12:34:29 -0600 (Wed, 03 Feb 2010) | 8 lines
  
  The chanvar= setting should inherit the entire list of variables, not just the first one.
  
  (closes issue #16359)
   Reported by: raarts
   Patches: 
         dahdi-setvars.diff uploaded by raarts (license 937)
   Tested by: raarts
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=244507&r1=244506&r2=244507
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Wed Feb  3 12:43:37 2010
@@ -9193,7 +9193,13 @@
 		tmp->callgroup = conf->chan.callgroup;
 		tmp->pickupgroup= conf->chan.pickupgroup;
 		if (conf->chan.vars) {
-			tmp->vars = ast_variable_new(conf->chan.vars->name, conf->chan.vars->value, "");
+			struct ast_variable *v, *tmpvar;
+	                for (v = conf->chan.vars ; v ; v = v->next) {
+        	                if ((tmpvar = ast_variable_new(v->name, v->value, v->file))) {
+                	                tmpvar->next = tmp->vars;
+                        	        tmp->vars = tmpvar;
+                        	}
+                	}
 		}
 		tmp->cid_rxgain = conf->chan.cid_rxgain;
 		tmp->rxgain = conf->chan.rxgain;