ph10 2006/02/14 15:56:43 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src verify.c
exim-test/log 0482
exim-test/rejectlog 0482
Log:
Omit spaces between name and colon in header syntax verify error
message.
Revision Changes Path
1.302 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.33 +6 -4 exim/exim-src/src/verify.c
1.2 +1 -1 exim/exim-test/log/0482
1.2 +1 -1 exim/exim-test/rejectlog/0482
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog 14 Feb 2006 15:24:10 -0000 1.301
+++ ChangeLog 14 Feb 2006 15:56:43 -0000 1.302
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.301 2006/02/14 15:24:10 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.302 2006/02/14 15:56:43 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -171,6 +171,10 @@
selector is set. In addition, the log line for abandonment now contains
information about the queue run such as the pid. This is always present
in "start" and "stop" lines but was omitted from the "abandon" line.
+
+PH/34 Omit spaces between a header name and the colon in the error message that
+ is given when verify = headers_syntax fails (if there are lots of them,
+ the message gets confusing).
Exim version 4.60
Index: verify.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/verify.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- verify.c 13 Feb 2006 11:13:37 -0000 1.32
+++ verify.c 14 Feb 2006 15:56:43 -0000 1.33
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/verify.c,v 1.32 2006/02/13 11:13:37 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/verify.c,v 1.33 2006/02/14 15:56:43 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1415,14 +1415,16 @@
{
uschar *verb = US"is";
uschar *t = ss;
+ uschar *tt = colon;
int len;
/* Arrange not to include any white space at the end in the
- error message. */
+ error message or the header name. */
while (t > s && isspace(t[-1])) t--;
+ while (tt > h->text && isspace(tt[-1])) tt--;
- /* Add the address which failed to the error message, since in a
+ /* Add the address that failed to the error message, since in a
header with very many addresses it is sometimes hard to spot
which one is at fault. However, limit the amount of address to
quote - cases have been seen where, for example, a missing double
@@ -1437,8 +1439,8 @@
}
*msgptr = string_printing(
- string_sprintf("%s: failing address in \"%.*s\" header %s: %.*s",
- errmess, colon - h->text, h->text, verb, len, s));
+ string_sprintf("%s: failing address in \"%.*s:\" header %s: %.*s",
+ errmess, tt - h->text, h->text, verb, len, s));
return FAIL;
}
Index: 0482
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0482,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0482 7 Feb 2006 10:34:46 -0000 1.1
+++ 0482 14 Feb 2006 15:56:43 -0000 1.2
@@ -1,2 +1,2 @@
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "From " header is: userx
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx
Index: 0482
===================================================================
RCS file: /home/cvs/exim/exim-test/rejectlog/0482,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0482 7 Feb 2006 10:47:29 -0000 1.1
+++ 0482 14 Feb 2006 15:56:43 -0000 1.2
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "From " header is: userx
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@???> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx
Envelope-from: <userx@???>
Envelope-to: <userx@???>
P Received: from [127.0.0.1] (helo=foobar)
