From 75a647cb59e04896e04296c767763df72352a08e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 4 Mar 2023 23:27:14 +0000 Subject: Testsuite: split bounce longline testcase int with/out DSN-info variants --- test/confs/0635 | 31 ---------- test/confs/0997 | 31 ++++++++++ test/confs/0998 | 1 + test/log/0635 | 6 -- test/log/0997 | 6 ++ test/log/0998 | 6 ++ test/runtest | 10 +-- test/scripts/0000-Basic/0635 | 37 ----------- test/scripts/0997-no-DSN-info/0997 | 37 +++++++++++ test/scripts/0997-no-DSN-info/REQUIRES | 1 + test/scripts/0998-DSN-info/0998 | 37 +++++++++++ test/scripts/0998-DSN-info/REQUIRES | 1 + test/stdout/0635 | 108 --------------------------------- test/stdout/0997 | 92 ++++++++++++++++++++++++++++ test/stdout/0998 | 108 +++++++++++++++++++++++++++++++++ 15 files changed, 325 insertions(+), 187 deletions(-) delete mode 100644 test/confs/0635 create mode 100644 test/confs/0997 create mode 120000 test/confs/0998 delete mode 100644 test/log/0635 create mode 100644 test/log/0997 create mode 100644 test/log/0998 delete mode 100644 test/scripts/0000-Basic/0635 create mode 100644 test/scripts/0997-no-DSN-info/0997 create mode 100644 test/scripts/0997-no-DSN-info/REQUIRES create mode 100644 test/scripts/0998-DSN-info/0998 create mode 100644 test/scripts/0998-DSN-info/REQUIRES delete mode 100644 test/stdout/0635 create mode 100644 test/stdout/0997 create mode 100644 test/stdout/0998 (limited to 'test') diff --git a/test/confs/0635 b/test/confs/0635 deleted file mode 100644 index 3c8a68708..000000000 --- a/test/confs/0635 +++ /dev/null @@ -1,31 +0,0 @@ -# Exim test configuration 0635 - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -trusted_users = CALLER -bounce_return_linesize_limit = 20 -acl_smtp_rcpt = accept - - -# ----- Routers ----- - -begin routers - -my_main_router: - driver = manualroute - transport = t1 - route_list = * 127.0.0.1::PORT_S - self = send - -# ----- Transports ----- - -begin transports - -t1: - driver = smtp - -# End diff --git a/test/confs/0997 b/test/confs/0997 new file mode 100644 index 000000000..fbbbcbcc2 --- /dev/null +++ b/test/confs/0997 @@ -0,0 +1,31 @@ +# Exim test configuration 0997 + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +trusted_users = CALLER +bounce_return_linesize_limit = 20 +acl_smtp_rcpt = accept + + +# ----- Routers ----- + +begin routers + +my_main_router: + driver = manualroute + transport = t1 + route_list = * 127.0.0.1::PORT_S + self = send + +# ----- Transports ----- + +begin transports + +t1: + driver = smtp + +# End diff --git a/test/confs/0998 b/test/confs/0998 new file mode 120000 index 000000000..c76cbfaaf --- /dev/null +++ b/test/confs/0998 @@ -0,0 +1 @@ +0997 \ No newline at end of file diff --git a/test/log/0635 b/test/log/0635 deleted file mode 100644 index e91469bda..000000000 --- a/test/log/0635 +++ /dev/null @@ -1,6 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 ** fred@undeliverable.org R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550-no mate\n550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 12 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1] C="250 got that" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/0997 b/test/log/0997 new file mode 100644 index 000000000..e91469bda --- /dev/null +++ b/test/log/0997 @@ -0,0 +1,6 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 ** fred@undeliverable.org R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550-no mate\n550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 12 +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1] C="250 got that" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/0998 b/test/log/0998 new file mode 100644 index 000000000..e91469bda --- /dev/null +++ b/test/log/0998 @@ -0,0 +1,6 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 ** fred@undeliverable.org R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550-no mate\n550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 12 +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=my_main_router T=t1 H=127.0.0.1 [127.0.0.1] C="250 got that" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/runtest b/test/runtest index 82ae480ce..64a8e7f37 100755 --- a/test/runtest +++ b/test/runtest @@ -4051,10 +4051,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) { if (!defined $parm_malware{$1}) { $wantthis = 0; last; } } - elsif (/^feature (.*)$/) + elsif (/^(not )?feature (.*)$/) { # move to a subroutine? - my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $1"; + my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2"; open (IN, "$parm_cwd/confs/0000") || tests_exit(-1, "Couldn't open $parm_cwd/confs/0000: $!\n"); @@ -4069,10 +4069,10 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++) close(OUT); system($eximinfo . " >/dev/null 2>&1"); - if ($? != 0) { - unlink("$parm_cwd/test-config"); + if (!defined $1 && $? != 0 || defined $1 && $? == 0) { $wantthis = 0; - $_ = "feature $1"; + unlink("$parm_cwd/test-config"); + $_ = "$1feature $2"; last; } unlink("$parm_cwd/test-config"); diff --git a/test/scripts/0000-Basic/0635 b/test/scripts/0000-Basic/0635 deleted file mode 100644 index 314c84ebb..000000000 --- a/test/scripts/0000-Basic/0635 +++ /dev/null @@ -1,37 +0,0 @@ -# bounce from long SMTP response -# -server PORT_S 2 -220 Hi -EHLO -250 Yo -MAIL FROM -250 ok -RCPT TO -550-no mate\x0d\x0a550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789\x0d\x0a550 go away -QUIT -250 bye -*eof -220 Hi -EHLO -250 Yo -MAIL FROM:<> -250 ok -RCPT TO -250 acceptable -DATA -354 go ahead -. -250 got that -QUIT -250 bye -**** -# -exim -odi fred@undeliverable.org -Subject: test - -msg with ok lines -00000000001111111 -01234567890123456 -**** -# -no_msglog_check diff --git a/test/scripts/0997-no-DSN-info/0997 b/test/scripts/0997-no-DSN-info/0997 new file mode 100644 index 000000000..314c84ebb --- /dev/null +++ b/test/scripts/0997-no-DSN-info/0997 @@ -0,0 +1,37 @@ +# bounce from long SMTP response +# +server PORT_S 2 +220 Hi +EHLO +250 Yo +MAIL FROM +250 ok +RCPT TO +550-no mate\x0d\x0a550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789\x0d\x0a550 go away +QUIT +250 bye +*eof +220 Hi +EHLO +250 Yo +MAIL FROM:<> +250 ok +RCPT TO +250 acceptable +DATA +354 go ahead +. +250 got that +QUIT +250 bye +**** +# +exim -odi fred@undeliverable.org +Subject: test + +msg with ok lines +00000000001111111 +01234567890123456 +**** +# +no_msglog_check diff --git a/test/scripts/0997-no-DSN-info/REQUIRES b/test/scripts/0997-no-DSN-info/REQUIRES new file mode 100644 index 000000000..8157857bb --- /dev/null +++ b/test/scripts/0997-no-DSN-info/REQUIRES @@ -0,0 +1 @@ +not feature _HAVE_DSN_INFO diff --git a/test/scripts/0998-DSN-info/0998 b/test/scripts/0998-DSN-info/0998 new file mode 100644 index 000000000..314c84ebb --- /dev/null +++ b/test/scripts/0998-DSN-info/0998 @@ -0,0 +1,37 @@ +# bounce from long SMTP response +# +server PORT_S 2 +220 Hi +EHLO +250 Yo +MAIL FROM +250 ok +RCPT TO +550-no mate\x0d\x0a550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789\x0d\x0a550 go away +QUIT +250 bye +*eof +220 Hi +EHLO +250 Yo +MAIL FROM:<> +250 ok +RCPT TO +250 acceptable +DATA +354 go ahead +. +250 got that +QUIT +250 bye +**** +# +exim -odi fred@undeliverable.org +Subject: test + +msg with ok lines +00000000001111111 +01234567890123456 +**** +# +no_msglog_check diff --git a/test/scripts/0998-DSN-info/REQUIRES b/test/scripts/0998-DSN-info/REQUIRES new file mode 100644 index 000000000..c7948c5e1 --- /dev/null +++ b/test/scripts/0998-DSN-info/REQUIRES @@ -0,0 +1 @@ +feature _HAVE_DSN_INFO diff --git a/test/stdout/0635 b/test/stdout/0635 deleted file mode 100644 index 3d494c0c5..000000000 --- a/test/stdout/0635 +++ /dev/null @@ -1,108 +0,0 @@ - -******** SERVER ******** -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 Hi -EHLO myhost.test.ex -250 Yo -MAIL FROM: -250 ok -RCPT TO: -550-no mate -550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 -550 go away -QUIT -250 bye -Expected EOF read from client -Listening on port 1224 ... -Connection request from [127.0.0.1] -220 Hi -EHLO myhost.test.ex -250 Yo -MAIL FROM:<> -250 ok -RCPT TO: -250 acceptable -DATA -354 go ahead -Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 - for CALLER@myhost.test.ex; - Tue, 2 Mar 1999 09:44:33 +0000 -X-Failed-Recipients: fred@undeliverable.org -Auto-Submitted: auto-replied -From: Mail Delivery System -To: CALLER@myhost.test.ex -References: -Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM -MIME-Version: 1.0 -Subject: Mail delivery failed: returning message to sender -Message-Id: -Date: Tue, 2 Mar 1999 09:44:33 +0000 - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: text/plain; charset=us-ascii - -This message was created automatically by mail delivery software. - -A message that you sent could not be delivered to one or more of its -recipients. This is a permanent error. The following address(es) failed: - - fred@undeliverable.org - host 127.0.0.1 [127.0.0.1] - SMTP error from remote mail server after RCPT TO:: - 550-no mate - 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 1[truncated] - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: message/delivery-status - -Reporting-MTA: dns; myhost.test.ex - -Action: failed -Final-Recipient: rfc822;fred@undeliverable.org -Status: 5.0.0 -Remote-MTA: dns; 127.0.0.1 -Remote-MTA: X-ip; [127.0.0.1]:1111 -X-Exim-Diagnostic: X-str; SMTP error from remote mail server after RCPT - TO:: 550-no mate - 550-123456789 100 123456789 a really long line to blow the limits - 123456789 123456789 123456789 123456789 200 123456789 123456789 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789 - 123456789 123456789 400 123456789 123456789 123456789 123456789 - 123456789 123456789 123456789 123456789 123456789 500 123456789 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789 - 123456789 600 123456789 123456789 123456789 123456789 123456789 - 123456789 123456789 123456789 123456789 700 123456789 123456789 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 - 123456789 123456789 123456789 123456789 123456789 123456789 123456789 - 123456789 123456789 900 123456789 123456789 123456789 123456789 - 123456789 123456789 123456789 123456789 123456789 1000 123456789 12 -Diagnostic-Code: smtp; 550-no mate - 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1[truncated] - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: message/rfc822 - -Return-path: -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for fred@undeliverable.org; - Tue, 2 Mar 1999 09:44:33 +0000 -Subject: test -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -msg with ok lines -00000000001111111 -01234567890123456 - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM-- -. -250 got that -QUIT -250 bye -End of script diff --git a/test/stdout/0997 b/test/stdout/0997 new file mode 100644 index 000000000..aead5bb2f --- /dev/null +++ b/test/stdout/0997 @@ -0,0 +1,92 @@ + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Hi +EHLO myhost.test.ex +250 Yo +MAIL FROM: +250 ok +RCPT TO: +550-no mate +550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 +550 go away +QUIT +250 bye +Expected EOF read from client +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Hi +EHLO myhost.test.ex +250 Yo +MAIL FROM:<> +250 ok +RCPT TO: +250 acceptable +DATA +354 go ahead +Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) + id 10HmaY-0005vi-00 + for CALLER@myhost.test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +X-Failed-Recipients: fred@undeliverable.org +Auto-Submitted: auto-replied +From: Mail Delivery System +To: CALLER@myhost.test.ex +References: +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 +Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + +This message was created automatically by mail delivery software. + +A message that you sent could not be delivered to one or more of its +recipients. This is a permanent error. The following address(es) failed: + + fred@undeliverable.org + host 127.0.0.1 [127.0.0.1] + SMTP error from remote mail server after RCPT TO:: + 550-no mate + 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 1[truncated] + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; myhost.test.ex + +Action: failed +Final-Recipient: rfc822;fred@undeliverable.org +Status: 5.0.0 +Remote-MTA: dns; 127.0.0.1 +Diagnostic-Code: smtp; 550-no mate + 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1[truncated] + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 + +Return-path: +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for fred@undeliverable.org; + Tue, 2 Mar 1999 09:44:33 +0000 +Subject: test +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +msg with ok lines +00000000001111111 +01234567890123456 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- +. +250 got that +QUIT +250 bye +End of script diff --git a/test/stdout/0998 b/test/stdout/0998 new file mode 100644 index 000000000..3d494c0c5 --- /dev/null +++ b/test/stdout/0998 @@ -0,0 +1,108 @@ + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Hi +EHLO myhost.test.ex +250 Yo +MAIL FROM: +250 ok +RCPT TO: +550-no mate +550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1000 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1100 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 +550 go away +QUIT +250 bye +Expected EOF read from client +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Hi +EHLO myhost.test.ex +250 Yo +MAIL FROM:<> +250 ok +RCPT TO: +250 acceptable +DATA +354 go ahead +Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) + id 10HmaY-0005vi-00 + for CALLER@myhost.test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +X-Failed-Recipients: fred@undeliverable.org +Auto-Submitted: auto-replied +From: Mail Delivery System +To: CALLER@myhost.test.ex +References: +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 +Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + +This message was created automatically by mail delivery software. + +A message that you sent could not be delivered to one or more of its +recipients. This is a permanent error. The following address(es) failed: + + fred@undeliverable.org + host 127.0.0.1 [127.0.0.1] + SMTP error from remote mail server after RCPT TO:: + 550-no mate + 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 1[truncated] + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; myhost.test.ex + +Action: failed +Final-Recipient: rfc822;fred@undeliverable.org +Status: 5.0.0 +Remote-MTA: dns; 127.0.0.1 +Remote-MTA: X-ip; [127.0.0.1]:1111 +X-Exim-Diagnostic: X-str; SMTP error from remote mail server after RCPT + TO:: 550-no mate + 550-123456789 100 123456789 a really long line to blow the limits + 123456789 123456789 123456789 123456789 200 123456789 123456789 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789 + 123456789 123456789 400 123456789 123456789 123456789 123456789 + 123456789 123456789 123456789 123456789 123456789 500 123456789 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789 + 123456789 600 123456789 123456789 123456789 123456789 123456789 + 123456789 123456789 123456789 123456789 700 123456789 123456789 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 + 123456789 123456789 123456789 123456789 123456789 123456789 123456789 + 123456789 123456789 900 123456789 123456789 123456789 123456789 + 123456789 123456789 123456789 123456789 123456789 1000 123456789 12 +Diagnostic-Code: smtp; 550-no mate + 550-123456789 100 123456789 a really long line to blow the limits 123456789 123456789 123456789 123456789 200 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 300 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 400 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 500 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 600 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 700 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 800 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 900 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 1[truncated] + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 + +Return-path: +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for fred@undeliverable.org; + Tue, 2 Mar 1999 09:44:33 +0000 +Subject: test +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +msg with ok lines +00000000001111111 +01234567890123456 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- +. +250 got that +QUIT +250 bye +End of script -- cgit v1.2.1