GnuTLS: fix for clients offering no TLS extensions

[exim.git] / test / stdout / 0023

diff --git a/test/stdout/0023 b/test/stdout/0023
index 266184af0a6406216504cbf784c90a3e45dab721..6f5af965f7660380a8cb3df02faede49ce12a0d5 100644 (file)
--- a/test/stdout/0023
+++ b/test/stdout/0023
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [1.2.3.4]\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
@@ -21,6 +22,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.7.8]\r
 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
@@ -33,6 +35,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [9.9.9.9]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -43,6 +46,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [9.9.9.8]\r
 250 OK\r
 550 don't like this host\r
 550 don't like this host\r
@@ -53,6 +57,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [9.9.9.255]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -63,6 +68,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.8.1]\r
 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
@@ -87,6 +93,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.11.1]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -99,6 +106,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.12.1]\r
 250 OK\r
 250 Accepted\r
 550 failed nested acl\r
@@ -109,6 +117,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.12.2]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -119,6 +128,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [8.8.8.8]\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
@@ -128,6 +138,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [5.6.13.1]\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
@@ -139,6 +150,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.11.12.13]\r
 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
@@ -149,6 +161,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.11.12.12]\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
@@ -159,6 +172,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [20.20.20.20]\r
 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r
@@ -171,6 +185,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [20.20.20.20]\r
 250 OK\r
 550 recipient verify failure\r
 250 Accepted\r
@@ -181,6 +196,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [21.21.21.21]\r
 250 OK\r
 550 Unrouteable address\r
 250 Accepted\r
@@ -203,6 +219,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [22.22.22.22]\r
 250 OK\r
 550 Administrative prohibition\r
 250 Accepted\r
@@ -213,6 +230,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [23.23.23.0]\r
 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r
@@ -227,6 +245,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [23.23.23.1]\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
@@ -236,6 +255,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [24.24.24.24]\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
@@ -245,6 +265,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [25.25.25.25]\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
@@ -254,6 +275,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [26.26.26.26]\r
 250 OK\r
 250 Accepted\r
 550 bounce messages can have only one recipient\r
@@ -265,6 +287,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [27.27.27.27]\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
@@ -274,6 +297,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [28.28.28.28]\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r
@@ -289,6 +313,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.0.0.3]\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
@@ -298,15 +323,37 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [V4NET.0.0.97]\r
 250 OK\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 myhost.test.ex Hello test [V4NET.99.99.96]\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 myhost.test.ex Hello test [V4NET.99.99.96]\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!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [29.29.29.29]\r
 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r
@@ -319,9 +366,11 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [30.30.30.30]\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
@@ -330,6 +379,7 @@
 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
 
@@ -338,16 +388,19 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [31.31.31.31]\r
 250 OK\r
 250 Accepted\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 myhost.test.ex Hello CALLER at test [32.32.32.32]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-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 myhost.test.ex Hello CALLER at test [32.32.32.32]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
@@ -359,6 +412,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [33.33.33.33]\r
 250 OK\r
 550 sender verify failure\r
 550 sender verify failure\r
@@ -369,16 +423,19 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [44.44.44.1]\r
 250 OK\r
 250 Accepted\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 myhost.test.ex Hello CALLER at test [55.55.55.55]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-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 myhost.test.ex Hello CALLER at test [56.56.56.56]\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
@@ -421,20 +478,28 @@
 250 OK id=10HmbJ-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 myhost.test.ex Hello CALLER at test [56.56.57.57]\r
 250 OK\r
 250 accepted by condition\r
 354 Enter message, ending with "." on a line by itself\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 myhost.test.ex Hello CALLER at test [56.56.56.56]\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 myhost.test.ex Hello CALLER at test [56.56.58.58]\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
@@ -443,14 +508,16 @@
 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 myhost.test.ex Hello CALLER at test [56.56.59.59]\r
 250 OK\r
 550-ACL message for verification failure\r
 550 Original was >here is a fail message<\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 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]\r
 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
@@ -461,6 +528,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 myhost.test.ex Hello test [60.60.60.60]\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r