Fix ${tr...} and empty-strings. Bug 3023

[exim.git] / test / log / 0374

diff --git a/test/log/0374 b/test/log/0374
index ee8934eb0493bcbefd0c9ce0e8d48d1dfe557995..b23542aaa1f95d86677eb7aa0981cf43e7bd8e84 100644 (file)
--- a/test/log/0374
+++ b/test/log/0374
@@ -1,21 +1,21 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => a1 <a1@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => b1 <b1@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => c1 <c1@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => d1 <d1@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => d2 <d2@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => d3 <d3@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaX-0005vi-00 => a1 <a1@myhost.test.ex> R=u1 T=ut1
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-1999-03-02 09:44:33 10HmaX-0005vi-00 => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]
-1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d3@myhost.test.ex R=ut4 T=ut4: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 hard error
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=real T=real
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
-1999-03-02 09:44:33 10HmaX-0005vi-00 127.0.0.1 [127.0.0.1] Connection refused
-1999-03-02 09:44:33 10HmaX-0005vi-00 == d2@myhost.test.ex R=ut4 T=ut4 defer (dd): Connection refused
-1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a1 <a1@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => b1 <b1@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => c1 <c1@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => d1 <d1@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => d2 <d2@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => d3 <d3@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => a1 <a1@myhost.test.ex> R=u1 T=ut1
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => CALLER <CALLER@myhost.test.ex> R=real T=real
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 Start queue run: pid=p1234 -qf
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=127.0.0.1 [127.0.0.1] Connection refused
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 == d2@myhost.test.ex R=ut4 T=ut4 defer (dd): Connection refused
+1999-03-02 09:44:33 End queue run: pid=p1234 -qf