Merged revisions 123710 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 18 Jun 2008 20:23:58 +0000 (20:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 18 Jun 2008 20:23:58 +0000 (20:23 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123710 | tilghman | 2008-06-18 15:22:42 -0500 (Wed, 18 Jun 2008) | 7 lines

Set the variables top-down, so that if a script sets a variable more than once,
the last one will take precedence.
(closes issue #12673)
 Reported by: phber
 Patches:
       20080519__bug12673.diff.txt uploaded by Corydon76 (license 14)

........

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

pbx/pbx_spool.c

index 793ccde..37ff0ed 100644 (file)
@@ -109,7 +109,11 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
        char buf[256];
        char *c, *c2;
        int lineno = 0;
-       struct ast_variable *var;
+       struct ast_variable *var, *last = o->vars;
+
+       while (last && last->next) {
+               last = last->next;
+       }
 
        while(fgets(buf, sizeof(buf), f)) {
                lineno++;
@@ -205,8 +209,13 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
                                        if (c2) {
                                                var = ast_variable_new(c, c2, fn);
                                                if (var) {
-                                                       var->next = o->vars;
-                                                       o->vars = var;
+                                                       /* Always insert at the end, because some people want to treat the spool file as a script */
+                                                       if (last) {
+                                                               last->next = var;
+                                                       } else {
+                                                               o->vars = var;
+                                                       }
+                                                       last = var;
                                                }
                                        } else
                                                ast_log(LOG_WARNING, "Malformed \"%s\" argument.  Should be \"%s: variable=value\"\n", buf, buf);