Fix logging all_parents for cutthrough delivery. Bug 2296

diff --git a/src/src/verify.c b/src/src/verify.c
index 6411899c80081e2b00acbb5876b205eabb7f7f94..c92ef65cd105d1823650d15ed0a23b353760b13f 100644 (file)
--- 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 ad48ebda881be4f9cf72338a3f75a8e8a6b32ee7..980e02a48222ada0bb425f683665938d85df3590 100644 (file)
--- 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 2b367ac3cb9e6f11c13625e2f9d5b4d5320148b9..99fead158b760f27dbc5188137a70c646ecf47ac 100644 (file)
--- 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