Handle TAB, not just SP, in MAIL args.

Analysis, diagnosis and variant patch by Todd Lyons.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f24e1a8f9a2d613abf3195baf76f239ba9d86c13..ee63f414ed460041302affae00c8cf6af2b72e4d 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -41,6 +41,10 @@ PP/10 Added dbmjz lookup type.
 
 PP/11 Let heimdal_gssapi authenticator take a SASL message without an authzid.
 
 
 PP/11 Let heimdal_gssapi authenticator take a SASL message without an authzid.
 

+PP/12 MAIL args handles TAB as well as SP, for better interop with
+      non-compliant senders.
+      Analysis and variant patch by Todd Lyons.
+

 
 Exim version 4.77
 -----------------
 
 Exim version 4.77
 -----------------

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index e79f0a202e233c010aaa25e11ab600f3edd0e66b..476bbf0c27787bb7907d6d3906f1fab29c2b990d 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -983,7 +983,8 @@ if (*v != '=') return FALSE;
 n = v;
 while(isalpha(n[-1])) n--;
 
 n = v;
 while(isalpha(n[-1])) n--;
 

-if (n[-1] != ' ') return FALSE;
+/* RFC says SP, but TAB seen in wild and other major MTAs accept it */
+if (!isspace(n[-1])) return FALSE;

 
 n[-1] = 0;
 *name = n;
 
 n[-1] = 0;
 *name = n;