Gitweb:
https://git.exim.org/exim.git/commitdiff/d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a
Commit: d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a
Parent: 8a6b4e02cd384193a5566e8601bdd97249b22284
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Aug 11 14:45:42 2018 +0100
Committer: Jeremy Harris <jgh146exb@???>
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 <= CALLER@??? U=CALLER P=local-esmtp S=sss for ruserx@???
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 rcpt for rruserx@???
-1999-03-02 09:44:33 10HmaZ-0005vi-00 >> userx@??? <rruserx@???> 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 >> userx@??? (ruserx@???) <rruserx@???> 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 <= CALLER@??? U=CALLER P=local-esmtp S=sss for rruserx@???
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 rcpt for rrruserx@???
-1999-03-02 09:44:33 10HmbA-0005vi-00 >> userx@??? <rrruserx@???> 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 >> userx@??? (ruserx@???, rruserx@???) <rrruserx@???> 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 <= CALLER@??? U=CALLER P=local-esmtp S=sss for rrruserx@???
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
