From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 3 Feb 2010 18:40:49 +0000 (+0000)
Subject: Merged revisions 244505 via svnmerge from
X-Git-Tag: 1.6.0.23~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761bf2a9dd691414ac4464cf4aa5bb15f463f46a;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@244506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b4228827bc..4b60521072 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -9006,7 +9006,13 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		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;