SRS: fix mismerge

[exim.git] / test / log / 0022

diff --git a/test/log/0022 b/test/log/0022
index 5db88e1506511c8182b9984ca399b2ca7e582e78..0a01877486c1be2223b8cb23c035814a2882348d 100644 (file)
--- a/test/log/0022
+++ b/test/log/0022
@@ -11,11 +11,13 @@
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 
 ******** SERVER ********

-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D

 1999-03-02 09:44:33 Connections=1
 1999-03-02 09:44:33 Connections=1

-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss

 1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL
 1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL

-1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss

 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL
 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL

-1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 exim x.yz daemon started: pid=p1235, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 H=[127.0.0.1] rejected connection in "connect" ACL: 550 client disliked