Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stdout / 0023

diff --git a/test/stdout/0023 b/test/stdout/0023
index 266184af0a6406216504cbf784c90a3e45dab721..a835f2a4eeaa6d1871189d960aca41ba8330c423 100644 (file)
--- a/test/stdout/0023
+++ b/test/stdout/0023
@@ -302,6 +302,24 @@
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 

+**** SMTP testing session as if from host V4NET.99.99.96
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+451 Temporary local problem - please try later\r
+221 myhost.test.ex closing connection\r
+
+**** SMTP testing session as if from host V4NET.99.99.96
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+221 myhost.test.ex closing connection\r
+

 **** SMTP testing session as if from host 29.29.29.29
 **** but without any ident (RFC 1413) callback.
 **** This is not for real!
 **** SMTP testing session as if from host 29.29.29.29
 **** but without any ident (RFC 1413) callback.
 **** This is not for real!


@@ -322,6 +340,7 @@
 250 OK\r
 550-domain=test.ex\r
 550-value=V4NET.0.0.1\r
 250 OK\r
 550-domain=test.ex\r
 550-value=V4NET.0.0.1\r

+550-matched=ten-1\r

 550 text=""\r
 250 Reset OK\r
 250 OK\r
 550 text=""\r
 250 Reset OK\r
 250 OK\r


@@ -330,6 +349,7 @@
 250 OK\r
 550-domain=test.ex\r
 550-value=127.0.0.2\r
 250 OK\r
 550-domain=test.ex\r
 550-value=127.0.0.2\r

+550-matched=13.12.11.V4NET.rbl\r

 550 text="This is a test blacklisting message"\r
 221 myhost.test.ex closing connection\r
 
 550 text="This is a test blacklisting message"\r
 221 myhost.test.ex closing connection\r
 


@@ -427,12 +447,17 @@
 250 OK id=10HmbK-0005vi-00\r
 250 OK\r
 451 Temporary local problem - please try later\r
 250 OK id=10HmbK-0005vi-00\r
 250 OK\r
 451 Temporary local problem - please try later\r

+250 Reset OK\r
+250 OK\r
+250 accepted by condition\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbL-0005vi-00\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbL-0005vi-00\r
+250 OK id=10HmbM-0005vi-00\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r


@@ -443,7 +468,7 @@
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbM-0005vi-00\r
+250 OK id=10HmbN-0005vi-00\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r