fanf2 2008/08/07 12:05:03 BST
Modified files:
exim-src/src expand.c
exim-doc/doc-txt ChangeLog
Log:
Fix the way ${extract is skipped in the untaken branch of a conditional.
Revision Changes Path
1.551 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.96 +1 -1 exim/exim-src/src/expand.c
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- expand.c 22 May 2008 10:56:27 -0000 1.95
+++ expand.c 7 Aug 2008 11:05:03 -0000 1.96
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.95 2008/05/22 10:56:27 fanf2 Exp $ */
+/* $Cambridge: exim/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 (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";
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- ChangeLog 28 Jul 2008 18:46:44 -0000 1.550
+++ ChangeLog 7 Aug 2008 11:05:03 -0000 1.551
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.550 2008/07/28 18:46:44 fanf2 Exp $
+$Cambridge: exim/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/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
-----------------
