diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-08-11 14:45:42 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-08-11 14:45:42 +0100 |
| commit | d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a (patch) | |
| tree | 31d2397c5345978f3b2974e9835bdbc6a61fff70 | |
| parent | 8a6b4e02cd384193a5566e8601bdd97249b22284 (diff) | |
Fix logging all_parents for cutthrough delivery. Bug 2296
| -rw-r--r-- | src/src/verify.c | 2 | ||||
| -rw-r--r-- | test/confs/5400 | 2 | ||||
| -rw-r--r-- | test/log/5408 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/src/verify.c b/src/src/verify.c index 6411899c8..c92ef65cd 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 ad48ebda8..980e02a48 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 2b367ac3c..99fead158 100644 --- a/test/log/5408 +++ b/test/log/5408 @@ -8,10 +8,10 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for ruserx@domain.com 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 rcpt for rruserx@domain.com -1999-03-02 09:44:33 10HmaZ-0005vi-00 >> userx@domain.com <rruserx@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 >> userx@domain.com (ruserx@domain.com) <rruserx@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 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for rruserx@domain.com 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 rcpt for rrruserx@domain.com -1999-03-02 09:44:33 10HmbA-0005vi-00 >> userx@domain.com <rrruserx@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 >> userx@domain.com (ruserx@domain.com, rruserx@domain.com) <rrruserx@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 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for rrruserx@domain.com 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed |