From: Tony Finch <dot@dotat.at>
Date: Thu, 6 Dec 2012 20:16:39 +0000 (+0000)
Subject: Make gecos expansion work with test 0412 as well as 0254.
X-Git-Tag: exim-4_81_RC1~3^2~22
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/5de8faa3f396e967020b5152525faad90d828e95

Make gecos expansion work with test 0412 as well as 0254.
---

diff --git a/src/src/receive.c b/src/src/receive.c
index 4d77bcd96..eef0531a8 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -2035,9 +2035,12 @@ for (h = header_list->next; h != NULL; h = h->next)
       from_header = h;
       if (!smtp_input)
         {
+        int len;
         uschar *s = Ustrchr(h->text, ':') + 1;
         while (isspace(*s)) s++;
-        if (strcmpic(s, originator_login) == 0)
+        len = h->slen - (s - h->text) - 1;
+        if (strncmpic(s, originator_login, len) == 0
+            && Ustrlen(originator_login) == len)
           {
           uschar *name = is_resent? US"Resent-From" : US"From";
           header_add(htype_from, "%s: %s <%s@%s>\n", name, originator_name,