aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-03 18:40:49 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-03 18:40:49 +0000
commitc97c98571b6df01cb982e4dca181f3e7be50d81b (patch)
tree27f7061ac6eb65ce4c9c19d544f35c2cfdafaf0b
parentf04f470bcb68598efca099cbdb80082e8e493fdc (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@244506 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_dahdi.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b4228827b..4b6052107 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;