Transports: pass back next id for continued-transport

[exim.git] / test / log / 3600

diff --git a/test/log/3600 b/test/log/3600
index 3263418e1380acda79c55658a554d1b903d49f8a..b9497b779a37b062510c2c80c8955103e9a466fd 100644 (file)
--- a/test/log/3600
+++ b/test/log/3600
@@ -1,17 +1,17 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 => x@y R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=spa C="250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 sender address changed to <bad@test.ex> by CALLER
-1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 spa authenticator failed H=127.0.0.1 [127.0.0.1] 535 Incorrect authentication data
-1999-03-02 09:44:33 10HmaY-0005vi-00 == x@y R=r1 T=t1 defer (-42): authentication required but authentication attempt(s) failed
-1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= ok@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 Start queue run: pid=p1234
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => x@y R=r1 T=t1 H=127.0.0.1 [127.0.0.1] A=spa C="250 OK id=10HmaY-000000005vi-0000"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 End queue run: pid=p1234
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 sender address changed to <bad@test.ex> by CALLER
+1999-03-02 09:44:33 Start queue run: pid=p1235
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 spa authenticator failed H=127.0.0.1 [127.0.0.1] 535 Incorrect authentication data
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 == x@y R=r1 T=t1 defer (-42): authentication required but authentication attempt(s) failed
+1999-03-02 09:44:33 End queue run: pid=p1235

 
 ******** SERVER ********
 
 ******** SERVER ********

-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=spa:username S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1236, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= ok@test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=spa:username S=sss id=E10HmaX-000000005vi-0000@myhost.test.ex

 1999-03-02 09:44:33 spa authenticator failed for localhost (myhost.test.ex) [127.0.0.1]: 535 Incorrect authentication data (set_id=username)
 1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
 1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
 1999-03-02 09:44:33 spa authenticator failed for localhost (myhost.test.ex) [127.0.0.1]: 535 Incorrect authentication data (set_id=username)
 1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data
 1999-03-02 09:44:33 spa authenticator failed for (xxxx) [127.0.0.1]: 535 Incorrect authentication data