diff options
Diffstat (limited to 'test/stdout')
63 files changed, 949 insertions, 248 deletions
diff --git a/test/stdout/0002 b/test/stdout/0002 index 6c195b269..3018dce1f 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -189,6 +189,17 @@ > mask: 0.0.0.0/0 > Failed: missing mask value in "192.168.10.206" > Failed: "a.b.c.d" is not an IP address +> ipv6denorm: 0000:0000:0000:0000:0000:0000:0000:0001 +> ipv6denorm: fe00:0000:0000:0000:0000:0000:0000:0001 +> ipv6denorm: 0000:0000:0000:0000:0000:ffff:c0a8:0001 +> ipv6denorm: fe80:0000:0000:0000:0000:0000:c0a8:0001 +> ipv6norm: ::1 +> ipv6norm: 2a00:: +> ipv6norm: 2a00::1 +> ipv6norm: 2a00:eadf::1:0 +> ipv6norm: 2a00:eadf:0:1:: +> ipv6norm: 2a00:: +> ipv6norm: 2a00:2:3:4:5:6:7:8 > nhash: 19 0/61 > lc/uc: the quick BROWN FOX > length: The quick abc @@ -778,6 +789,11 @@ xyz > > true > +> # Environment access +> +> CALLER +> correct +> > > escape: B7·F2ò > @@ -787,6 +803,7 @@ xyz > yes > match_address: no > +> -be Sender host name and address etc, all unset > -oMa sender_host_address = > sender_host_port = 0 > -oMaa sender_host_authenticated = @@ -798,6 +815,7 @@ xyz > -oMs sender_host_name = > -oMt sender_ident = CALLER > +> -be Sender host name and address etc, all set except host name. > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMaa sender_host_authenticated = AAA @@ -808,16 +826,20 @@ xyz > -oMr received_protocol = special > -oMt sender_ident = me > +> -be Sender host name explicitly set > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMs sender_host_name = my.host.name > +> be Sender host name lookup fails (V4NET.11.12.13 is not reverse registered) > -oMs sender_host_name = > host_lookup_failed = 1 > +> -be Sender host name and protocol set by Sendmail-compatible option > -p received_protocol = special > -p sender_host_name = host.name > +> -be Sender host name and address etc, all set except host name > -oMa sender_host_address = V4NET.0.0.1 > sender_host_port = 1234 > -oMaa sender_host_authenticated = AAA diff --git a/test/stdout/0023 b/test/stdout/0023 index b805f334b..a835f2a4e 100644 --- a/test/stdout/0023 +++ b/test/stdout/0023 @@ -302,6 +302,24 @@ 550 Administrative prohibition
221 myhost.test.ex closing connection
+**** 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
+250 OK
+451 Temporary local problem - please try later
+221 myhost.test.ex closing connection
+ +**** 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
+250 OK
+250 Accepted
+221 myhost.test.ex closing connection
+ **** SMTP testing session as if from host 29.29.29.29 **** but without any ident (RFC 1413) callback. **** This is not for real! diff --git a/test/stdout/0026 b/test/stdout/0026 index f95e2ffb2..1fac53793 100644 --- a/test/stdout/0026 +++ b/test/stdout/0026 @@ -2,7 +2,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbD-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
@@ -26,7 +26,13 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
@@ -38,7 +44,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbF-0005vi-00
221 myhost.test.ex closing connection
**** SMTP testing session as if from host 10.0.0.0 @@ -66,13 +72,13 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbG-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbH-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
diff --git a/test/stdout/0047 b/test/stdout/0047 index 258578d9a..c1cd94d94 100644 --- a/test/stdout/0047 +++ b/test/stdout/0047 @@ -1,9 +1,9 @@ xx@domain1 router = domainlist, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] xx@route1.ex router = domainlist, transport = smtp - host ten-2.test.ex [V4NET.0.0.2] + host ten-2.test.ex [V4NET.0.0.2] xx@domain3 router = domainlist, transport = smtp - host ten-3.test.ex [V4NET.0.0.3] + host ten-3.test.ex [V4NET.0.0.3] diff --git a/test/stdout/0054 b/test/stdout/0054 index ca26171e7..b99c2545a 100644 --- a/test/stdout/0054 +++ b/test/stdout/0054 @@ -1,4 +1,4 @@ xxx@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] xxx@ten-2.test.ex is undeliverable: Unrouteable address diff --git a/test/stdout/0078 b/test/stdout/0078 index 272e0f224..483feff2e 100644 --- a/test/stdout/0078 +++ b/test/stdout/0078 @@ -3,8 +3,8 @@ xx@mxt6.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=5 myhost.test.ex@mxt1.test.ex router = self, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] + host myhost.test.ex [V4NET.10.10.10] xx@mxt1.test.ex router = self2, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] + host myhost.test.ex [V4NET.10.10.10] xx@not.exist is undeliverable: Unrouteable address diff --git a/test/stdout/0089 b/test/stdout/0089 index 0238dbffb..751edc5f9 100644 --- a/test/stdout/0089 +++ b/test/stdout/0089 @@ -36,5 +36,5 @@ ABCD@test.ex router = select, transport = dummy XYZ@ten-1.test.ex router = manual, transport = dummy - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] xyz@ten-1.test.ex is undeliverable: unrouteable mail domain "ten-1.test.ex" diff --git a/test/stdout/0099 b/test/stdout/0099 index 35b7f54b6..0f6f7f2fa 100644 --- a/test/stdout/0099 +++ b/test/stdout/0099 @@ -40,6 +40,21 @@ first failed = time last try = time2 next try = time2 + 900 first failed = time last try = time2 next try = time2 + 900 T:thisloop.test.ex:999 dd 65 Connection refused first failed = time last try = time2 next try = time2 + 900 ++++++++++++++++++++++++++++ + R:mxt2.test.ex -32 0 all relevant MX records point to non-existent hosts +first failed = time last try = time2 next try = time2 + 1800 + R:nonexist -32 0 lookup of host "nonexist.test.ex" failed in all router +first failed = time last try = time2 next try = time2 + 1800 + T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused +first failed = time last try = time2 next try = time2 + 900 + T:thishost.test.ex:999 dd 65 Connection refused +first failed = time last try = time2 next try = time2 + 900 + T:thisloop.test.ex:127.0.0.1:999 dd 65 Connection refused +first failed = time last try = time2 next try = time2 + 900 + T:thisloop.test.ex:ip4.ip4.ip4.ip4:999 dd 65 Connection refused +first failed = time last try = time2 next try = time2 + 900 + T:thisloop.test.ex:999 dd 65 Connection refused +first failed = time last try = time2 next try = time2 + 900 Retry rule: *.star.ex * F,3d,10m; Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist * F,1d,3m; Retry rule: !*.not.ex * F,2d,15m; @@ -55,3 +70,4 @@ Retry rule: rcpt463.test.ex * F,1w3d,3m; Retry rule: * * G,1d,1m,1.5; Retry rule: * * G,2d,2m,1.5; Retry rule: * * F,1w5d,2h30m; +Retry rule: * * F,1w3d,30m; diff --git a/test/stdout/0121 b/test/stdout/0121 index 5e3968243..d52013bcd 100644 --- a/test/stdout/0121 +++ b/test/stdout/0121 @@ -35,3 +35,44 @@ 354 Enter message, ending with "." on a line by itself
451 Temporary local problem - please try later
221 the.local.host.name closing connection
+ +**** SMTP testing session as if from host 127.0.0.1 +**** but without any ident (RFC 1413) callback. +**** This is not for real! + +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-the.local.host.name Hello foo.bar [127.0.0.1]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Reset OK
+250-the.local.host.name Hello foo.bar [127.0.0.1]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Reset OK
+250-the.local.host.name Hello foo.bar [127.0.0.1]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Reset OK
+250-the.local.host.name Hello foo.bar [127.0.0.1]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Reset OK
+250-the.local.host.name Hello foo.bar [127.0.0.1]
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+221 the.local.host.name closing connection
diff --git a/test/stdout/0147 b/test/stdout/0147 index b877c6110..45e48244b 100644 --- a/test/stdout/0147 +++ b/test/stdout/0147 @@ -23,6 +23,8 @@ no_check_local_user condition = debug_print = no_disable_logging +dnssec_request_domains = +dnssec_require_domains = domains = driver = accept no_dsn_lasthop diff --git a/test/stdout/0161 b/test/stdout/0161 index 0593ee327..b8332fe44 100644 --- a/test/stdout/0161 +++ b/test/stdout/0161 @@ -3,10 +3,10 @@ xx@mxt6.test.ex host ten-1.test.ex [V4NET.0.0.1] MX=5 myhost.test.ex@mxt1.test.ex router = self, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] + host myhost.test.ex [V4NET.10.10.10] xx@mxt1.test.ex router = self2, transport = remote_smtp - host myhost.test.ex [V4NET.10.10.10] + host myhost.test.ex [V4NET.10.10.10] xx@not.exist is undeliverable: Unrouteable address ff@mxt1.test.ex is undeliverable: lowest numbered MX record points to local host fff@mxt1.test.ex is undeliverable: lookup of host "fff" failed in fail router diff --git a/test/stdout/0183 b/test/stdout/0183 index 2737f0938..66b21e58a 100644 --- a/test/stdout/0183 +++ b/test/stdout/0183 @@ -2,31 +2,31 @@ userx@test.again.dns cannot be resolved at this time: host lookup did not comple abcd@test.again.dns cannot be resolved at this time: host lookup did not complete abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] usery@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?) userz@test.again.dns cannot be resolved at this time: host lookup for test.again.dns did not complete (DNS timeout?) xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] userx@test.fail.dns cannot be resolved at this time: host lookup did not complete abcd@test.fail.dns cannot be resolved at this time: host lookup did not complete abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] usery@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?) userz@test.fail.dns cannot be resolved at this time: host lookup for test.fail.dns did not complete (DNS timeout?) xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] userx@nonexist.test.ex is undeliverable: Unrouteable address abcd@nonexist.test.ex is undeliverable: Unrouteable address abcd@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] usery@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router userz@nonexist.test.ex cannot be resolved at this time: lookup of host "nonexist.test.ex" failed in useryz router xyz@ten-1.test.ex router = lookuphost, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] srv@test.again.dns cannot be resolved at this time: host lookup did not complete srv@test.fail.dns cannot be resolved at this time: host lookup did not complete diff --git a/test/stdout/0186 b/test/stdout/0186 index 3653da9b7..c7477c165 100644 --- a/test/stdout/0186 +++ b/test/stdout/0186 @@ -1,6 +1,6 @@ userx@other2.test.ex router = lookuphost, transport = smtp - host other2.test.ex [V4NET.12.3.1] + host other2.test.ex [V4NET.12.3.1] userx@ten-5-6.test.ex router = domainlist, transport = smtp - host ten-5-6.test.ex [V4NET.0.0.5] + host ten-5-6.test.ex [V4NET.0.0.5] diff --git a/test/stdout/0187 b/test/stdout/0187 index cef8628c9..db9c2eabd 100644 --- a/test/stdout/0187 +++ b/test/stdout/0187 @@ -1,9 +1,9 @@ userx@other2.test.ex router = lookuphost2, transport = smtp - host other2.test.ex [V4NET.12.3.1] + host other2.test.ex [V4NET.12.3.1] userx@ten-5-6.test.ex router = domainlist, transport = smtp - host ten-5-6.test.ex [V4NET.0.0.5] + host ten-5-6.test.ex [V4NET.0.0.5] userx@mxt7.test.ex router = lookuphost, transport = smtp host ten-3.test.ex [V4NET.0.0.3] MX=6 @@ -12,7 +12,7 @@ userx@mxt9.test.ex host ten-3.test.ex [V4NET.0.0.3] MX=7 userx@eximtesthost.test.ex router = lookuphost2, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] userx@localhost is undeliverable: Unrouteable address userx@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent hosts userx@mxt11.test.ex is undeliverable: all relevant MX records point to non-existent hosts diff --git a/test/stdout/0190 b/test/stdout/0190 index 4ca02adc5..a88a851b0 100644 --- a/test/stdout/0190 +++ b/test/stdout/0190 @@ -1,114 +1,114 @@ x@x router = others, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.1 [V4NET.0.0.1] x@y router = others, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] x@z router = others, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.1 [V4NET.0.0.1] x@batch router = batched, transport = smtp2 - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] y@batch router = batched, transport = smtp2 - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.7 [V4NET.0.0.7] z@batch router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] x@batch2 router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] y@batch2 router = batched, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] x@batch3 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] y@batch3 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] x@batch4 router = batched2, transport = smtp2 - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.7 [V4NET.0.0.7] y@batch4 router = batched2, transport = smtp2 - host V4NET.0.0.2 [V4NET.0.0.2] - host V4NET.0.0.1 [V4NET.0.0.1] - host V4NET.0.0.3 [V4NET.0.0.3] - host V4NET.0.0.5 [V4NET.0.0.5] - host V4NET.0.0.6 [V4NET.0.0.6] - host V4NET.0.0.4 [V4NET.0.0.4] - host V4NET.0.0.7 [V4NET.0.0.7] + host V4NET.0.0.2 [V4NET.0.0.2] + host V4NET.0.0.1 [V4NET.0.0.1] + host V4NET.0.0.3 [V4NET.0.0.3] + host V4NET.0.0.5 [V4NET.0.0.5] + host V4NET.0.0.6 [V4NET.0.0.6] + host V4NET.0.0.4 [V4NET.0.0.4] + host V4NET.0.0.7 [V4NET.0.0.7] userx@bdomain1 router = r3, transport = smtp2 - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] host 127.0.0.1 [127.0.0.1] - host the.local.host.name [ip4.ip4.ip4.ip4] + host the.local.host.name [ip4.ip4.ip4.ip4] userx@bdomain2 router = r3, transport = smtp2 - host the.local.host.name [ip4.ip4.ip4.ip4] + host the.local.host.name [ip4.ip4.ip4.ip4] host 127.0.0.1 [127.0.0.1] - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] userx@bdomain3 router = r3, transport = smtp2 - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] host 127.0.0.1 [127.0.0.1] - host the.local.host.name [ip4.ip4.ip4.ip4] + host the.local.host.name [ip4.ip4.ip4.ip4] ******** SERVER ******** Listening on port 1224 ... diff --git a/test/stdout/0191 b/test/stdout/0191 index 59474cfad..1417996b9 100644 --- a/test/stdout/0191 +++ b/test/stdout/0191 @@ -12,7 +12,7 @@ RCPT TO:<userx@domain1> 250 Recipient OK DATA 354 Send message -Line without end +Line-without-end . 250 OK QUIT diff --git a/test/stdout/0211 b/test/stdout/0211 index 446203b4f..ebe8246b0 100644 --- a/test/stdout/0211 +++ b/test/stdout/0211 @@ -18,6 +18,10 @@ QUIT End of script Listening on port 1224 ... Connection request from [127.0.0.1] +220 Connected OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] 550 Go away QUIT 250 OK diff --git a/test/stdout/0230 b/test/stdout/0230 index d7d68d378..67e1ffec0 100644 --- a/test/stdout/0230 +++ b/test/stdout/0230 @@ -73,3 +73,9 @@ End of script 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/0239 b/test/stdout/0239 index 29766a24a..a8582a668 100644 --- a/test/stdout/0239 +++ b/test/stdout/0239 @@ -1,13 +1,13 @@ userx@localhost router = rrr, transport = local - host a.host.name + host a.host.name userx@localhost verified userx@localhost router = rrr, transport = local - host a.host.name + host a.host.name userx@localhost router = rrr, transport = local - host a.host.name + host a.host.name userx@smtp router = sss, transport = smtp - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] diff --git a/test/stdout/0259 b/test/stdout/0259 index c4f4ea083..b65d88452 100644 --- a/test/stdout/0259 +++ b/test/stdout/0259 @@ -69,7 +69,7 @@ End of script Listening on port 1413 ... Connection request from [127.0.0.1] <999 , 25 ->999 , 25 : USERID : UNIX :ab
cd +>999 , 25 : USERID : UNIX :ab\x0dcd End of script Listening on port 1413 ... Connection request from [127.0.0.1] diff --git a/test/stdout/0288 b/test/stdout/0288 index 8f36a023d..3eab9dfe7 100644 --- a/test/stdout/0288 +++ b/test/stdout/0288 @@ -25,3 +25,27 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000 QUIT 250 OK End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO myhost.test.ex +250-OK +250 HELP +MAIL FROM:<CALLER@test.ex> +250 Sender OK +RCPT TO:<b@test.ex> +250 Recipient OK +DATA +354 Send data +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 OK +QUIT +250 OK +End of script diff --git a/test/stdout/0323 b/test/stdout/0323 index 136a4d85e..8289f065f 100644 --- a/test/stdout/0323 +++ b/test/stdout/0323 @@ -1,3 +1,3 @@ x@y router = r1, transport = t1 - host quoted.y + host quoted.y diff --git a/test/stdout/0344 b/test/stdout/0344 index 2452f7692..913b0cd6b 100644 --- a/test/stdout/0344 +++ b/test/stdout/0344 @@ -1,12 +1,12 @@ x@d1 router = r1, transport = t1 - host 192.168.4.3 [192.168.4.3] + host 192.168.4.3 [192.168.4.3] x@d2 router = r2, transport = t2 - host V4NET.9.8.7 [V4NET.9.8.7] + host V4NET.9.8.7 [V4NET.9.8.7] x@d30 router = r3, transport = t4 - host 1.2.3.4 [1.2.3.4] + host 1.2.3.4 [1.2.3.4] x@d31 router = r3, transport = t3 - host 1.2.3.4 [1.2.3.4] + host 1.2.3.4 [1.2.3.4] diff --git a/test/stdout/0350 b/test/stdout/0350 index 71109bd86..d951172b7 100644 --- a/test/stdout/0350 +++ b/test/stdout/0350 @@ -1,4 +1,4 @@ xx@yy router = r1, transport = t1 host 1.2.3.4 [1.2.3.4] - host other2.test.ex [V4NET.12.3.2] + host other2.test.ex [V4NET.12.3.2] diff --git a/test/stdout/0364 b/test/stdout/0364 index 7990d897c..05341ee6f 100644 --- a/test/stdout/0364 +++ b/test/stdout/0364 @@ -7,9 +7,9 @@ solik@otherhost.sub.test.ex is undeliverable: Can't route to otherhost.sub.test. xxx@ten-1.test.ex <-- xxx@ten-1 router = r2, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] xxx@testsub.sub.test.ex <-- xxx@testsub.test.ex <-- xxx@testsub router = r2, transport = t1 - host testsub.sub.test.ex [V4NET.99.0.3] + host testsub.sub.test.ex [V4NET.99.0.3] diff --git a/test/stdout/0368 b/test/stdout/0368 index cfd96796e..81c2ed5d2 100644 --- a/test/stdout/0368 +++ b/test/stdout/0368 @@ -9,6 +9,6 @@ x@mxt14.test.ex host ten-5-6.test.ex [V4NET.0.0.6] MX=4 x@manualroute router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] - host ten-1.test.ex [V4NET.0.0.1] - host ten-2.test.ex [V4NET.0.0.2] + host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] + host ten-2.test.ex [V4NET.0.0.2] diff --git a/test/stdout/0390 b/test/stdout/0390 index a80e34c38..ca6f90cbd 100644 --- a/test/stdout/0390 +++ b/test/stdout/0390 @@ -52,6 +52,7 @@ headers_remove = headers_rewrite = home_directory = no_initgroups +max_parallel = message_size_limit = no_rcpt_include_affixes retry_use_local_part @@ -106,6 +107,7 @@ headers_remove = headers_rewrite = home_directory = no_initgroups +max_parallel = message_size_limit = no_rcpt_include_affixes retry_use_local_part diff --git a/test/stdout/0394 b/test/stdout/0394 index 8e82308c1..858b0658f 100644 --- a/test/stdout/0394 +++ b/test/stdout/0394 @@ -22,9 +22,3 @@ **** This is not for real! 451 Temporary local problem - please try later
- -**** SMTP testing session as if from host V4NET.255.255.255 -**** but without any ident (RFC 1413) callback. -**** This is not for real! - -451 Temporary local problem - please try later
diff --git a/test/stdout/0405 b/test/stdout/0405 index 6b561f74f..8a0641056 100644 --- a/test/stdout/0405 +++ b/test/stdout/0405 @@ -1,4 +1,4 @@ syntax error: domain missing or malformed bounce@Ï€.test.ex router = r1, transport = t1 - host mx.Ï€.test.ex [V4NET.255.255.255] MX=0 + host mx.xn--1xa.test.ex [V4NET.255.255.255] MX=0 diff --git a/test/stdout/0430 b/test/stdout/0430 index de3056664..7914594b4 100644 --- a/test/stdout/0430 +++ b/test/stdout/0430 @@ -1,19 +1,19 @@ x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] x@manual.route router = r1, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] x@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 @@ -22,27 +22,27 @@ x@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] y@random.manual.route router = r2, transport = t1 host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 - host ten-6.test.ex [V4NET.0.0.6] - host ten-1.test.ex [V4NET.0.0.1] + host ten-6.test.ex [V4NET.0.0.6] + host ten-1.test.ex [V4NET.0.0.1] x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] host ten-2.test.ex [V4NET.0.0.2] MX=5 host ten-3.test.ex [V4NET.0.0.3] MX=6 x@manual.route router = r1, transport = t1 - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host x@manual.route router = r1, transport = t1 @@ -53,7 +53,7 @@ x@manual.route is undeliverable: lowest numbered MX record points to local host x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router x@random.manual.route router = r2, transport = t1 - host ten-6.test.ex [V4NET.0.0.6] + host ten-6.test.ex [V4NET.0.0.6] host ten-1.test.ex [V4NET.0.0.1] MX=6 x@manual.route router = r1, transport = t1 diff --git a/test/stdout/0434 b/test/stdout/0434 index c438f0e2b..dc008c8e7 100644 --- a/test/stdout/0434 +++ b/test/stdout/0434 @@ -1,4 +1,4 @@ a@b router = r1, transport = t1 - host 1.2.3.4 [1.2.3.4] + host 1.2.3.4 [1.2.3.4] a@b cannot be resolved at this time: remote host address is the local host diff --git a/test/stdout/0442 b/test/stdout/0442 index b47d7b31b..34c6510fd 100644 --- a/test/stdout/0442 +++ b/test/stdout/0442 @@ -8,6 +8,8 @@ no_check_local_user condition = debug_print = no_disable_logging +dnssec_request_domains = +dnssec_require_domains = domains = driver = accept no_dsn_lasthop diff --git a/test/stdout/0463 b/test/stdout/0463 index 1bd1f1fa3..2612f2ea7 100644 --- a/test/stdout/0463 +++ b/test/stdout/0463 @@ -1,4 +1,4 @@ x@ten-1.test.ex <-- x@ten-1 router = all, transport = smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] diff --git a/test/stdout/0466 b/test/stdout/0466 index 517f664e4..a2cbc7910 100644 --- a/test/stdout/0466 +++ b/test/stdout/0466 @@ -1,3 +1,3 @@ x@y router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] diff --git a/test/stdout/0473 b/test/stdout/0473 index 9fff9a601..59ed36d6a 100644 --- a/test/stdout/0473 +++ b/test/stdout/0473 @@ -107,6 +107,26 @@ 250-PIPELINING
250 HELP
250 OK
+250 Accepted
+221 the.local.host.name closing connection
++++++++++++++++++++++++++++ +07-Mar-2000 12:21:52 r12@three.test.ex callout=accept +07-Mar-2000 12:21:52 r1@test.ex callout=accept +07-Mar-2000 12:21:52 r1@test.ex/<postmaster@the.local.host.name> callout=accept +07-Mar-2000 12:21:52 r1@test.ex/<s1@test.ex> callout=accept +07-Mar-2000 12:21:52 r1@test.ex/<s2@test.ex> callout=accept +07-Mar-2000 12:21:52 r9@test.ex/<x9@test.ex> callout=reject +07-Mar-2000 12:21:52 test.ex callout=accept postmaster=unknown random=unknown +07-Mar-2000 12:21:52 three.test.ex callout=accept postmaster=unknown random=reject (07-Mar-2000 12:21:52) +07-Mar-2000 12:21:52 two.test.ex callout=accept postmaster=unknown random=accept (07-Mar-2000 12:21:52) +07-Mar-2000 12:21:52 x9@test.ex callout=reject +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-the.local.host.name Hello CALLER at xxxx
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
451 Could not complete recipient verify callout
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -221,6 +241,28 @@ EHLO the.local.host.name 250 OK MAIL FROM:<> 250 OK +RCPT TO:<the.local.host.name--testing@three.test.ex> +550 Bad receipient, dropping conn +>*eof +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO the.local.host.name +250 OK +MAIL FROM:<> +250 OK +RCPT TO:<r12@three.test.ex> +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO the.local.host.name +250 OK +MAIL FROM:<> +250 OK RCPT TO:<r11@two.test.ex> *sleep 2 End of script diff --git a/test/stdout/0482 b/test/stdout/0482 index 9ece5a3ad..ad7ab62dc 100644 --- a/test/stdout/0482 +++ b/test/stdout/0482 @@ -14,8 +14,8 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 3 <<< 354 Enter message, ending with "." on a line by itself >>> From : userx ->>> ->>> This is junk +>>> +>>> This is junk >>> . ??? 5 <<< 550 Administrative prohibition diff --git a/test/stdout/0502 b/test/stdout/0502 index 4b307e817..a0fbe6b00 100644 --- a/test/stdout/0502 +++ b/test/stdout/0502 @@ -15,7 +15,7 @@ 250 OK id=10HmaY-0005vi-00
221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-221 myhost.test.ex closing connection
+221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 OK
221 myhost.test.ex closing connection
diff --git a/test/stdout/0545 b/test/stdout/0545 index 1495ed9e6..48dcd8f1b 100644 --- a/test/stdout/0545 +++ b/test/stdout/0545 @@ -1,7 +1,7 @@ userx@alias-eximtesthost.test.ex <-- userx@alias-eximtesthost router = dns, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] userx@alias-eximtesthost.test.ex router = dns, transport = smtp - host eximtesthost.test.ex [ip4.ip4.ip4.ip4] + host eximtesthost.test.ex [ip4.ip4.ip4.ip4] diff --git a/test/stdout/0548 b/test/stdout/0548 index 7f7d788b6..522bec99b 100644 --- a/test/stdout/0548 +++ b/test/stdout/0548 @@ -2,14 +2,21 @@ R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 1 T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred -first failed = time last try = time2 next try = time2 + 1 +first failed = time last try = time2 next try = time2 + 2 +++++++++++++++++++++++++++ R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 5 * T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred -first failed = time last try = time2 next try = time2 + 1 +first failed = time last try = time2 next try = time2 + 2 +++++++++++++++++++++++++++ R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 5 * T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred +first failed = time last try = time2 next try = time2 + 2 ++++++++++++++++++++++++++++ + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred +first failed = time last try = time2 next try = time2 + 5 * + R:usery@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 1 + T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred +first failed = time last try = time2 next try = time2 + 2 diff --git a/test/stdout/0557 b/test/stdout/0557 index 5077c0d0a..6a6bde9a4 100644 --- a/test/stdout/0557 +++ b/test/stdout/0557 @@ -3,11 +3,11 @@ userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer userx@test.ex router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] userx@test.ex router = r1, transport = t1 - host 127.0.0.1 [127.0.0.1] - host 127.0.0.2 [127.0.0.2] + host 127.0.0.1 [127.0.0.1] + host 127.0.0.2 [127.0.0.2] userx@test.ex cannot be resolved at this time: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=defer userx@test.ex is undeliverable: Unrouteable address userx@test.ex is undeliverable: lookup failed for all hosts in r1 router: host_find_failed=ignore host_all_ignored=fail diff --git a/test/stdout/1006 b/test/stdout/1006 index 87903f4ea..2657c47a9 100644 --- a/test/stdout/1006 +++ b/test/stdout/1006 @@ -4,17 +4,17 @@ dnslookup@mx46.test.ex host 46.test.ex [V4NET.0.0.4] MX=46 manualroute@test.ex router = r2, transport = smtp - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] host 46.test.ex [V4NET.0.0.4] dnslookup@v6.test.ex router = r1, transport = smtp - host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] + host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] dnslookup@mx46.test.ex router = r1, transport = smtp host 46.test.ex [V4NET.0.0.4] MX=46 manualroute@test.ex router = r2, transport = smtp - host 46.test.ex [V4NET.0.0.4] + host 46.test.ex [V4NET.0.0.4] dnslookup@v6.test.ex is undeliverable: Unrouteable address Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected ??? 220 diff --git a/test/stdout/1009 b/test/stdout/1009 index 65a5886d0..ccda782f5 100644 --- a/test/stdout/1009 +++ b/test/stdout/1009 @@ -1,6 +1,6 @@ x@46.test.ex router = r1, transport = t1 - host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] + host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] host 46.test.ex [V4NET.0.0.4] x@mx46.test.ex router = r1, transport = t1 diff --git a/test/stdout/2102 b/test/stdout/2102 index 965b7dddb..ec0a7c921 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -135,7 +135,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2114 b/test/stdout/2114 index c624f6381..050519979 100644 --- a/test/stdout/2114 +++ b/test/stdout/2114 @@ -31,7 +31,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -220,7 +220,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -311,7 +311,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094414:SSL routines:SSL3_READ_BYTES:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44 +pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44 Failed to start TLS End of script Connecting to 127.0.0.1 port 1225 ... connected diff --git a/test/stdout/2124 b/test/stdout/2124 index 251ae384f..9a7a744c5 100644 --- a/test/stdout/2124 +++ b/test/stdout/2124 @@ -34,7 +34,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 +pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2132 b/test/stdout/2132 index a9724e170..97aca85c1 100644 --- a/test/stdout/2132 +++ b/test/stdout/2132 @@ -135,7 +135,7 @@ SSL info: SSLv3 write finished A SSL info: SSLv3 flush data SSL info: SSLv3 read server session ticket A SSL info: SSLv3 read server session ticket A -pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 +pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40 Failed to start TLS End of script Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected diff --git a/test/stdout/2200 b/test/stdout/2200 index 90504c6da..71ff12017 100644 --- a/test/stdout/2200 +++ b/test/stdout/2200 @@ -19,6 +19,9 @@ > csa=csa1.test.ex Y csa1.test.ex > csa=csa2.test.ex N csa2.test.ex > +> soa=test.ex exim.test.ex +> soa=a.test.ex exim.test.ex hostmaster.exim.test.ex 1430683638 1200 120 604800 3600 +> > # DNS lookups with multiple items > > ten-1:ten2 V4NET.0.0.1 @@ -43,3 +46,11 @@ ten-2.test.ex > defer_never:defer > Failed: lookup of "defer_strict,a=test.again.dns:ten-1.test.ex" gave DEFER: > +> # Retry timeout and count. This only tests the syntax; we do not +> # have any good way of testing the function. +> +> delay1500 ip4.ip4.ip4.ip4 +> +> a=localhost.test.ex 127.0.0.1 +> a=localhost.test.ex 127.0.0.1 +> diff --git a/test/stdout/3000 b/test/stdout/3000 index 4ee74c877..ad21103b3 100644 --- a/test/stdout/3000 +++ b/test/stdout/3000 @@ -17,7 +17,7 @@ > 42 > 30 > 3 -> 2/8 +> X/X > > Tue, 2 Mar 1999 09:44:33 +0000 // Changed locale // Tue, 2 Mar 1999 09:44:33 +0000 > diff --git a/test/stdout/4000 b/test/stdout/4000 index 789a8fe1a..c1e2b2450 100644 --- a/test/stdout/4000 +++ b/test/stdout/4000 @@ -20,3 +20,58 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmaY-0005vi-00
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaZ-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbA-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/4001 b/test/stdout/4001 index 40cf7a9d5..6d66c7d64 100644 --- a/test/stdout/4001 +++ b/test/stdout/4001 @@ -45,14 +45,14 @@ ******** SERVER ******** Listening on port 1224 ... -Connection request from [127.0.0.1] +Connection request from [IP_LOOPBACK_ADDR] <GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0 < ><summary code="11"> >*eof End of script Listening on port 1224 ... -Connection request from [127.0.0.1] +Connection request from [IP_LOOPBACK_ADDR] <GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0 < > @@ -64,12 +64,12 @@ Connection request from [127.0.0.1] >*eof End of script Listening on port 1224 ... -Connection request from [127.0.0.1] +Connection request from [IP_LOOPBACK_ADDR] <GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0 *sleep 3 End of script Listening on port 1224 ... -Connection request from [127.0.0.1] +Connection request from [IP_LOOPBACK_ADDR] <GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0 *sleep 3 End of script diff --git a/test/stdout/4003 b/test/stdout/4003 index f27d19238..e705096f6 100644 --- a/test/stdout/4003 +++ b/test/stdout/4003 @@ -68,7 +68,7 @@ Connection request <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml >LF>random ignored line >LF>random ignored line 2 ->LF>OK Scan ok. +>LF>OK\x09Scan ok. Expected EOF read from client End of script Listening on TESTSUITE/eximdir/fsec_sock ... @@ -82,8 +82,8 @@ Connection request <CONFIGURE MIME 1 >ignored_response <SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml ->LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. +>LF>xxxINFECTED\x09blah\x09VNAME\x09blah +>LF>OK\x09Scan ok. Expected EOF read from client End of script Listening on TESTSUITE/eximdir/fsec_sock ... @@ -105,7 +105,7 @@ Connection request <CONFIGURE MIME 1 >ignored_response <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml ->LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. +>LF>xxxINFECTED\x09blah\x09VNAME\x09blah +>LF>OK\x09Scan ok. Expected EOF read from client End of script diff --git a/test/stdout/4005 b/test/stdout/4005 index 0a8a5ea9a..4d858c5b1 100644 --- a/test/stdout/4005 +++ b/test/stdout/4005 @@ -53,6 +53,17 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
******** SERVER ******** Listening on TESTSUITE/eximdir/clam_sock ... @@ -81,3 +92,10 @@ Listening on TESTSUITE/eximdir/clam_sock ... Connection request *sleep 3 End of script +Inital pause of 2 seconds +Listening on TESTSUITE/eximdir/clam_sock ... +Connection request +<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml +>LF>scanned_file_name: OK +Unexpected EOF read from client +End of script diff --git a/test/stdout/4006 b/test/stdout/4006 index bd18c9562..19e0f305b 100644 --- a/test/stdout/4006 +++ b/test/stdout/4006 @@ -63,7 +63,7 @@ Connection request >LF>200 FLAGS OK <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 >LF>210 SCAN DATA ->LF>blah [+] +>LF>blah\x09[+] >LF>200 SCAN OK <QUIT Unexpected EOF read from client @@ -73,7 +73,7 @@ Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 >LF>210 SCAN DATA ->LF>blah [E] +>LF>blah\x09[E] >LF>200 SCAN OK Unexpected EOF read from client Listening on TESTSUITE/eximdir/avast_sock ... @@ -81,7 +81,7 @@ Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 >LF>210 SCAN DATA ->LF>b\ l\ a\ h [L]9.9 9 VNAME +>LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME >LF>200 SCAN OK Unexpected EOF read from client Listening on TESTSUITE/eximdir/avast_sock ... diff --git a/test/stdout/4010 b/test/stdout/4010 index 819f449ef..2db3157dd 100644 --- a/test/stdout/4010 +++ b/test/stdout/4010 @@ -1,36 +1,18 @@ 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-8BITMIME
250-PIPELINING
250 HELP
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmaX-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
+250-8BITMIME
250-PIPELINING
250 HELP
250 OK
@@ -40,31 +22,3 @@ 550-If it was a legitimate message, it may still be delivered to the target
550 recipient(s).
221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-450-Your message has been rejected but is being kept for evaluation.
-450-If it was a legitimate message, it may still be delivered to the target
-450 recipient(s).
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Found Eicar-Test-Signature
-221 myhost.test.ex closing connection
diff --git a/test/stdout/4950 b/test/stdout/4950 index bd55df45f..89a34ad49 100644 --- a/test/stdout/4950 +++ b/test/stdout/4950 @@ -1,16 +1,16 @@ userx@black-1.test.ex router = lookuphost, transport = smtp - host black-1.test.ex [1.2.3.4] + host black-1.test.ex [1.2.3.4] ad=no userx@myhost.test.ex router = lookuphost, transport = smtp - host myhost.test.ex [V4NET.10.10.11] + host myhost.test.ex [V4NET.10.10.11] ad=no userx@ten-1.test.ex router = lookuphost, transport = smtp - host other2.test.ex [V4NET.12.3.1] - host other2.test.ex [V4NET.12.3.2] + host other2.test.ex [V4NET.12.3.1] ad=no + host other2.test.ex [V4NET.12.3.2] ad=no userx@other1.test.ex router = lookuphost, transport = smtp - host other1.test.ex [V4NET.12.4.5] + host other1.test.ex [V4NET.12.4.5] ad=no userx@other99.test.ex cannot be resolved at this time: host non-exist.test.ex not found when translating other99.test.ex [V4NET.99.0.1] userx@other99.test.ex router = lookuphost, transport = smtp diff --git a/test/stdout/5204 b/test/stdout/5204 index 5d438bb35..6a309bda4 100644 --- a/test/stdout/5204 +++ b/test/stdout/5204 @@ -5,10 +5,10 @@ "DEFER cannot route this one (DEFER)"@some.host cannot be resolved at this time: cannot route this one (DEFER) "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host router = q, transport = other_smtp - host ten-1.test.ex [V4NET.0.0.1] + host ten-1.test.ex [V4NET.0.0.1] PASS@some.host router = s, transport = smtp - host 127.0.0.1 [127.0.0.1] + host 127.0.0.1 [127.0.0.1] "FREEZE cannot route this one (FREEZE)"@some.host cannot be resolved at this time: cannot route this one (FREEZE) postmaster@test.ex <-- "REDIRECT postmaster@test.ex"@some.host diff --git a/test/stdout/5300 b/test/stdout/5300 index e2f83ccb3..bb3956b69 100644 --- a/test/stdout/5300 +++ b/test/stdout/5300 @@ -1,6 +1,6 @@ x@[V4NET.9.8.7] router = r1, transport = t1 - host [V4NET.9.8.7] [V4NET.9.8.7] + host [V4NET.9.8.7] [V4NET.9.8.7] x@[127.0.0.1] router = r3, transport = t1 0m sss 10HmaX-0005vi-00 <y@[10.9.8.7]> diff --git a/test/stdout/5301 b/test/stdout/5301 index 77c6fc727..acbcbff58 100644 --- a/test/stdout/5301 +++ b/test/stdout/5301 @@ -1,9 +1,9 @@ x@[abcd::dcba] router = r0, transport = t1 - host [abcd::dcba] [abcd::dcba] + host [abcd::dcba] [abcd::dcba] x@[IPv6:cba::abc] router = r0, transport = t1 - host [ipv6:cba::abc] [cba::abc] + host [ipv6:cba::abc] [cba::abc] x@[abcd::dcba] router = r3, transport = t1 x@[IPv6:cba::abc] diff --git a/test/stdout/5400 b/test/stdout/5400 index 4895072a3..05f2ef037 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -43,6 +43,78 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmbA-0005vi-00
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbB-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbD-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbE-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbF-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbG-0005vi-00
+221 myhost.test.ex closing connection
******** SERVER ******** Listening on port 1224 ... @@ -108,17 +180,6 @@ MAIL FROM:<CALLER@myhost.test.ex> 250 Sender OK RCPT TO:<usery@domain.com> 250 Recipient OK -QUIT -Expected EOF read from client -Listening on port 1224 ... -Connection request from [ip4.ip4.ip4.ip4] -220 ESMTP -EHLO myhost.test.ex -250 OK -MAIL FROM:<CALLER@myhost.test.ex> -250 Sender OK -RCPT TO:<usery@domain.com> -250 Recipient OK RCPT TO:<userx@domain.com> 250 Recipient OK DATA @@ -166,3 +227,284 @@ body QUIT 250 OK End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<no@domain.com> +550 Not that one +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<no@domain.com> +250 ok rcpt-1 +RCPT TO:<userx@domain.com> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 first recipient ok +RCPT TO:<no@domain.com> +550 Not that one +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 ok rcpt-1 +RCPT TO:<no@domain.com> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 first recipient ok +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<special_tpt@domain.com> +250 second recipient ok +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 ok rcpt-1 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<special_tpt@domain.com> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain1.com> +250 ok rcpt-1 +RCPT TO:<usery@domain2.com> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 first recipient ok +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<usery@special.com> +250 second recipient ok +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@domain.com> +250 ok rcpt-1 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +Expected EOF read from client +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<usery@special.com> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +250 OK +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK +RCPT TO:<userx@localhost4.test.ex> +250 ok rcpt-1 +RCPT TO:<usery@thishost.test.ex> +250 ok rcpt-2 +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbG-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbG-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +250 OK +QUIT +250 OK +End of script diff --git a/test/stdout/5500 b/test/stdout/5500 index d5efef741..37294c24b 100644 --- a/test/stdout/5500 +++ b/test/stdout/5500 @@ -204,3 +204,36 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 221 <<< 221 myhost.test.ex closing connection End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo rhu.barb +??? 250- +<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250-PRDR +<<< 250-PRDR +??? 250 +<<< 250 HELP +>>> mail from:<> +??? 250 +<<< 250 OK +>>> rcpt to:<userx@test.ex> +??? 250 +<<< 250 Accepted +>>> data +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> Sender: sender@some.where +>>> . +??? 250 +<<< 250 OK id=10HmbC-0005vi-00 +>>> quit +??? 221 +<<< 221 myhost.test.ex closing connection +End of script diff --git a/test/stdout/5600 b/test/stdout/5600 index ce8638213..d2d28dce6 100644 --- a/test/stdout/5600 +++ b/test/stdout/5600 @@ -133,3 +133,56 @@ SSL info: SSL negotiation finished successfully SSL connection using AES256-SHA Succeeded in starting TLS End of script +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +Certificate file = aux-fixed/cert2 +Key file = aux-fixed/cert2 +??? 220 +<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo rhu.barb +??? 250- +<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-STARTTLS +??? 250 +<<< 250 HELP +>>> starttls +??? 220 +<<< 220 TLS go ahead +Attempting to start TLS +SSL info: before/connect initialization +SSL info: before/connect initialization +SSL info: SSLv3 read server hello A +SSL info: SSLv3 read server certificate A +SSL info: SSLv3 read server certificate request A +SSL info: SSLv3 read server done A +SSL info: SSLv3 write client certificate A +SSL info: SSLv3 write client key exchange A +SSL info: SSLv3 write certificate verify A +SSL info: SSLv3 write change cipher spec A +SSL info: SSLv3 write finished A +SSL info: SSLv3 flush data +SSL info: SSLv3 read server session ticket A +SSL info: SSLv3 read finished A +SSL info: SSL negotiation finished successfully +SSL info: SSL negotiation finished successfully +SSL connection using AES256-SHA +Succeeded in starting TLS +>>> ehlo rhu.barb.tls +??? 250- +<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250 +<<< 250 HELP +>>> quit +End of script diff --git a/test/stdout/5650 b/test/stdout/5650 index e0bbf4507..7b5628c6a 100644 --- a/test/stdout/5650 +++ b/test/stdout/5650 @@ -78,3 +78,39 @@ Key file = aux-fixed/cert2 Attempting to start TLS Bad certificate End of script +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +Certificate file = aux-fixed/cert2 +Key file = aux-fixed/cert2 +??? 220 +<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo rhu.barb +??? 250- +<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250- +<<< 250-STARTTLS +??? 250 +<<< 250 HELP +>>> starttls +??? 220 +<<< 220 TLS go ahead +Attempting to start TLS +Succeeded in starting TLS +>>> ehlo rhu.barb.tls +??? 250- +<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-8BITMIME +??? 250- +<<< 250-PIPELINING +??? 250 +<<< 250 HELP +>>> quit +End of script diff --git a/test/stdout/5700 b/test/stdout/5700 index b185dca05..a8f3b7482 100644 --- a/test/stdout/5700 +++ b/test/stdout/5700 @@ -6,7 +6,7 @@ Connection request from [127.0.0.1] EHLO the.local.host.name 250-OK 250 HELP -MAIL FROM:<CALLER@the.local.host.name> +MAIL FROM:<> 250 OK RCPT TO:<userx@domain1> 250 OK @@ -32,7 +32,7 @@ Connection request from [127.0.0.1] EHLO the.local.host.name 250-OK 250 HELP -MAIL FROM:<CALLER@the.local.host.name> +MAIL FROM:<> 250 OK RCPT TO:<userx@domain2> 250 OK @@ -64,7 +64,20 @@ Connection request from [127.0.0.1] EHLO the.local.host.name 250-OK 250 HELP -MAIL FROM:<CALLER@the.local.host.name> +MAIL FROM:<> +250 OK +RCPT TO:<userx@domain1> +450 NOT RIGHT NOW +QUIT +220 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 ESMTP +EHLO the.local.host.name +250-OK +250 HELP +MAIL FROM:<> 250 OK RCPT TO:<userx@domain1> 550 GO AWAY |