SRS: fix mismerge

[exim.git] / test / log / 0593

diff --git a/test/log/0593 b/test/log/0593
index f3ab6ea125b91e74f09b07f31265314950d88f40..de70c2806a7dcbcd200510b104c05bde1368716c 100644 (file)
--- a/test/log/0593
+++ b/test/log/0593
@@ -1,2 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 == bill@the.local.host.name R=localuser T=local_delivery defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bill.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID)
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** bill@the.local.host.name: retry timeout exceeded
+1999-03-02 09:44:33 10HmaY-0005vi-00 bill@the.local.host.name: error ignored
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed