diff options
| author | Tony Finch <dot@dot.at> | 2008-08-07 11:05:03 +0000 |
|---|---|---|
| committer | Tony Finch <dot@dot.at> | 2008-08-07 11:05:03 +0000 |
| commit | e2803e40f432c44b56967261357dc38a33616a35 (patch) | |
| tree | 8ff70be2a3ef6ffe7e18ebf03ab076808a7d8f08 | |
| parent | 512314e949e4913a30b3b5d3f66840e6f3ce0584 (diff) | |
Fix the way ${extract is skipped in the untaken branch of a conditional.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/expand.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 347796353..425e15512 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.550 2008/07/28 18:46:44 fanf2 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.551 2008/08/07 11:05:03 fanf2 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -60,6 +60,8 @@ TF/05 Leading white space used to be stripped from $spam_report which TF/06 Save $spam_score, $spam_bar, and $spam_report in spool files, so that they are available at delivery time. +TF/07 Fix the way ${extract is skipped in the untaken branch of a conditional. + Exim version 4.69 ----------------- diff --git a/src/src/expand.c b/src/src/expand.c index fc203ac59..cd84294ae 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.95 2008/05/22 10:56:27 fanf2 Exp $ */ +/* $Cambridge: exim/src/src/expand.c,v 1.96 2008/08/07 11:05:03 fanf2 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -4659,7 +4659,7 @@ while (*s != 0) while (len > 0 && isspace(p[len-1])) len--; p[len] = 0; - if (*p == 0) + if (*p == 0 && !skipping) { expand_string_message = US"first argument of \"extract\" must " "not be empty"; |