ph10 2005/10/03 14:25:33 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src README.UPDATING
exim-src/src acl.c
Log:
Make name= in control=submission swallow the rest of the string, thus
allowing for slashes in the name, but requiring this option to be last.
Revision Changes Path
1.244 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.76 +10 -0 exim/exim-doc/doc-txt/NewStuff
1.9 +9 -0 exim/exim-src/README.UPDATING
1.50 +3 -1 exim/exim-src/src/acl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- ChangeLog 3 Oct 2005 11:26:21 -0000 1.243
+++ ChangeLog 3 Oct 2005 13:25:32 -0000 1.244
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.243 2005/10/03 11:26:21 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.244 2005/10/03 13:25:32 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -20,6 +20,12 @@
Also, for "Auto-Submitted", treat anything other than "no" as
non-personal, in accordance with RFC 3834. (Previously it treated
anything starting "auto-" as non-personal.)
+
+TF/01 The control=submission/name=... option had a problem with syntax
+ errors if the name included a slash character. The /name= option
+ now slurps the rest of the string, so it can include any characters
+ but it must come last in the list of options (after /sender_retain
+ or /domain=).
Exim version 4.53
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- NewStuff 22 Sep 2005 12:58:14 -0000 1.75
+++ NewStuff 3 Oct 2005 13:25:32 -0000 1.76
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.75 2005/09/22 12:58:14 fanf2 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.76 2005/10/03 13:25:32 ph10 Exp $
New Features in Exim
--------------------
@@ -7,6 +7,16 @@
but have not yet made it into the main manual (which is most conveniently
updated when there is a relatively large batch of changes). The doc/ChangeLog
file contains a listing of all changes, including bug fixes.
+
+Exim version 4.54
+-----------------
+
+There was a problem with 4.52/TF/02 in that a "name=" option on control=
+submission terminated at the next slash, thereby not allowing for slashes in
+the name. This has been changed so that "name=" takes the rest of the string as
+its data. It must therefore be the last option.
+
+
Exim version 4.53
-----------------
Index: README.UPDATING
===================================================================
RCS file: /home/cvs/exim/exim-src/README.UPDATING,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- README.UPDATING 14 Sep 2005 13:20:12 -0000 1.8
+++ README.UPDATING 3 Oct 2005 13:25:32 -0000 1.9
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/README.UPDATING,v 1.8 2005/09/14 13:20:12 ph10 Exp $
+$Cambridge: exim/exim-src/README.UPDATING,v 1.9 2005/10/03 13:25:32 ph10 Exp $
This document contains detailed information about incompatibilities that might
be encountered when upgrading from one release of Exim to another. The
@@ -26,6 +26,15 @@
The rest of this document contains information about changes in 4.xx releases
that might affect a running system.
+
+
+Exim version 4.54
+-----------------
+
+There was a problem with 4.52/TF/02 in that a "name=" option on control=
+submission terminated at the next slash, thereby not allowing for slashes in
+the name. This has been changed so that "name=" takes the rest of the string as
+its data. It must therefore be the last option.
Version 4.53
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- acl.c 22 Sep 2005 12:02:22 -0000 1.49
+++ acl.c 3 Oct 2005 13:25:33 -0000 1.50
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.49 2005/09/22 12:02:22 fanf2 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.50 2005/10/03 13:25:33 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2497,10 +2497,12 @@
submission_domain = string_copyn(p+8, pp-p-8);
p = pp;
}
+ /* The name= option must be last, because it swallows the rest of
+ the string. */
else if (Ustrncmp(p, "/name=", 6) == 0)
{
uschar *pp = p + 6;
- while (*pp != 0 && *pp != '/') pp++;
+ while (*pp != 0) pp++;
submission_name = string_copy(parse_fix_phrase(p+6, pp-p-6,
big_buffer, big_buffer_size));
p = pp;
