Sieve: add redirect router option for inbox name

[exim.git] / test / stderr / 0276

diff --git a/test/stderr/0276 b/test/stderr/0276
index eb289faae253fab90a30a0285bf2b8f53d51bd9d..a7b99023177c40d63a623ea1904075a925b069ea 100644 (file)
--- a/test/stderr/0276
+++ b/test/stderr/0276
@@ -1,7 +1,8 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmaX-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
@@ -17,13 +18,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP<< 200 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT:200'
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT+:200'
 LOG: MAIN
   ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
+delivering 10HmaY-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ failed: Connection refused
+cmdlog: (unset)
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
@@ -38,8 +41,9 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmaZ-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-server id
@@ -54,13 +58,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(shutdown)>>
   SMTP<< 200 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT:200'
+cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT+:200'
 LOG: MAIN
   ** usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO
 LOG: MAIN
-  <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
-delivering 10HmbA-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
+  <= <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss
+delivering 10HmbA-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+ failed: Connection refused
+cmdlog: (unset)
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN