Omit spaces between name and colon in header syntax verify error

message.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 37f47db80216caefba556a568c8a48105b4a15b0..5d645ab0cdc3810857bcc778d480b30715b3c086 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.301 2006/02/14 15:24:10 ph10 Exp $
+$Cambridge: 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
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -172,6 +172,10 @@ PH/33 When a queue run was abandoned because the load average was too high, a
       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.
 
       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
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/src/src/verify.c b/src/src/verify.c
index ef7ab8d226b2c3d19bdc7f82bb083eb4b3b91d65..5948000c2c0fc84efe7d45e4e8246dc77af5158d 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/verify.c,v 1.32 2006/02/13 11:13:37 ph10 Exp $ */
+/* $Cambridge: exim/src/src/verify.c,v 1.33 2006/02/14 15:56:43 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -1415,14 +1415,16 @@ for (h = header_list; h != NULL; h = h->next)
       {
       uschar *verb = US"is";
       uschar *t = ss;
       {
       uschar *verb = US"is";
       uschar *t = ss;

+      uschar *tt = colon;

       int len;
 
       /* Arrange not to include any white space at the end in the
       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 (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
       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 @@ for (h = header_list; h != NULL; h = h->next)
         }
 
       *msgptr = string_printing(
         }
 
       *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;
       }
 
       return FAIL;
       }

diff --git a/test/log/0482 b/test/log/0482
index a7880e15b64b5af0b343d5473143df6bef23e777..3e72c8ae24dd219fa819b5c95cd45b3fe55c40d5 100644 (file)
--- a/test/log/0482
+++ b/test/log/0482
@@ -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 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@test.ex> 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@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx

diff --git a/test/rejectlog/0482 b/test/rejectlog/0482
index 5118647b24a590bdcdef68ffec98c7cbca9eb929..f829fb217d34ab4ee9447beb7f072c863fe6cf4f 100644 (file)
--- a/test/rejectlog/0482
+++ b/test/rejectlog/0482
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=(foobar) [127.0.0.1] F=<userx@test.ex> 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@test.ex> rejected after DATA: unqualified address not permitted: failing address in "From:" header is: userx

 Envelope-from: <userx@test.ex>
 Envelope-to: <userx@test.ex>
 P Received: from [127.0.0.1] (helo=foobar)
 Envelope-from: <userx@test.ex>
 Envelope-to: <userx@test.ex>
 P Received: from [127.0.0.1] (helo=foobar)