https://bugs.exim.org/show_bug.cgi?id=2296

--- Comment #5 from Git Commit <g...@exim.org> ---
Git commit:
https://git.exim.org/exim.git/commitdiff/d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a

commit d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a
Author:     Jeremy Harris <jgh146...@wizmail.org>
AuthorDate: Sat Aug 11 14:45:42 2018 +0100
Commit:     Jeremy Harris <jgh146...@wizmail.org>
CommitDate: Sat Aug 11 14:45:42 2018 +0100

    Fix logging all_parents for cutthrough delivery.  Bug 2296
---
 src/src/verify.c | 2 +-
 test/confs/5400  | 2 +-
 test/log/5408    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/src/verify.c b/src/src/verify.c
index 6411899..c92ef65 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1101,7 +1101,7 @@ no_conn:
       cutthrough.addr.host_used = &cutthrough.host;
       for (caddr = &cutthrough.addr, parent = addr->parent;
        parent;
-       parent = parent->parent)
+       caddr = caddr->parent, parent = parent->parent)
         *(caddr->parent = store_get(sizeof(address_item))) = *parent;

       ctblock.buffer = ctbuffer;
diff --git a/test/confs/5400 b/test/confs/5400
index ad48ebd..980e02a 100644
--- a/test/confs/5400
+++ b/test/confs/5400
@@ -10,7 +10,7 @@ OPT=

 primary_hostname = myhost.test.ex

-log_selector = +received_recipients
+log_selector = +received_recipients +all_parents
 queue_only

 # ----- Main settings -----
diff --git a/test/log/5408 b/test/log/5408
index 2b367ac..99fead1 100644
--- a/test/log/5408
+++ b/test/log/5408
@@ -8,10 +8,10 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= cal...@myhost.test.ex U=CALLER
P=local-esmtp S=sss for rus...@domain.com
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 rcpt for rrus...@domain.com
-1999-03-02 09:44:33 10HmaZ-0005vi-00 >> us...@domain.com <rrus...@domain.com>
R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 >> us...@domain.com (rus...@domain.com)
<rrus...@domain.com> R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= cal...@myhost.test.ex U=CALLER
P=local-esmtp S=sss for rrus...@domain.com
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 rcpt for rrrus...@domain.com
-1999-03-02 09:44:33 10HmbA-0005vi-00 >> us...@domain.com <rrrus...@domain.com>
R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbA-0005vi-00 >> us...@domain.com (rus...@domain.com,
rrus...@domain.com) <rrrus...@domain.com> R=all T=smtp H=127.0.0.1 [127.0.0.1]
C="250 OK"
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= cal...@myhost.test.ex U=CALLER
P=local-esmtp S=sss for rrrus...@domain.com
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##

Reply via email to