Fix logging all_parents for cutthrough delivery. Bug 2296
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 11 Aug 2018 13:45:42 +0000 (14:45 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 11 Aug 2018 13:45:42 +0000 (14:45 +0100)
src/src/verify.c
test/confs/5400
test/log/5408

index 6411899..c92ef65 100644 (file)
@@ -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;
index ad48ebd..980e02a 100644 (file)
@@ -10,7 +10,7 @@ OPT=
 
 primary_hostname = myhost.test.ex
 
-log_selector = +received_recipients
+log_selector = +received_recipients +all_parents
 queue_only
 
 # ----- Main settings -----
index 2b367ac..99fead1 100644 (file)
@@ -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