DKIM: verify using separate pool-pair, reset per message

[users/heiko/exim.git] / test / stderr / 0218

diff --git a/test/stderr/0218 b/test/stderr/0218
index 28db0ea015706d22a4ea7ae15e18b6b91d01efd4..c07bd2a467bc9f0992f6e873b6ecea06c202e725 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -7,17 +7,17 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 looking in TESTSUITE/spool//input
-delivering 10HmaX-0005vi-00 (queue run pid ppppp)
+delivering 10HmaX-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmaY-0005vi-00 (queue run pid ppppp)
+delivering 10HmaY-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 queue running combined directories
 looking in TESTSUITE/spool//input
-delivering 10HmaX-0005vi-00 (queue run pid ppppp)
+delivering 10HmaX-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
@@ -25,8 +25,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
          250 PIPELINING
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<a@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<a@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 OK
@@ -44,18 +44,20 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-delivering 10HmaY-0005vi-00 (queue run pid ppppp)
+delivering 10HmaY-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<b@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<b@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 Send more
   SMTP>> writing message and terminating "."
+  SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP<< 250 OK
-  SMTP>> QUIT
   SMTP(close)>>
 LOG: MAIN
   => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
@@ -74,17 +76,17 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 looking in TESTSUITE/spool//input
-delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
+delivering 10HmaZ-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+delivering 10HmbA-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 queue running combined directories
 looking in TESTSUITE/spool//input
-delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
+delivering 10HmaZ-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
@@ -92,13 +94,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
          250 PIPELINING
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<a@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<a@test.ex>
   SMTP>> DATA
   SMTP<< 550 NO
   SMTP<< 503 Unexpected RCPT
   SMTP<< 503 Unexpected DATA
-  SMTP>> QUIT
+  SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN
   ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO
@@ -112,7 +116,7 @@ LOG: MAIN
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+delivering 10HmbA-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
@@ -130,11 +134,11 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
-delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+delivering 10HmbA-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmbB-0005vi-00 (queue run pid ppppp)
+delivering 10HmbB-0005vi-00 (queue run pid pppp)
 R: bounce  (ACL)
 LOG: MAIN
   ** CALLER@test.ex F=<> R=bounce: just discard
@@ -143,11 +147,11 @@ LOG: MAIN
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+delivering 10HmbC-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-delivering 10HmbA-0005vi-00 (queue run pid ppppp)
+delivering 10HmbA-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
@@ -155,8 +159,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
          250 PIPELINING
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<b@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<b@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 550 Unknown
@@ -181,18 +185,20 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+delivering 10HmbC-0005vi-00 (queue run pid pppp)
 R: client  (ACL)
 T: send_to_server  (ACL)
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<c@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<c@test.ex>
   SMTP>> DATA
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 OK
   SMTP>> writing message and terminating "."
+  SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP<< 250 OK
-  SMTP>> QUIT
   SMTP(close)>>
 LOG: MAIN
   => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"