DSN: Under EXPERIMENTAL_DSN_INFO add extras to bounce messages. Bug 1686

6 files changed, 189 insertions, 0 deletions

diff --git a/test/confs/4700 b/test/confs/4700
new file mode 120000
index 000000000..bf798671f
--- /dev/null
+++ b/test/confs/4700
@@ -0,0 +1 @@
+0211
\ No newline at end of file
diff --git a/test/log/4700 b/test/log/4700
new file mode 100644
index 000000000..35da72e04
--- /dev/null
+++ b/test/log/4700
@@ -0,0 +1,21 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 450 I'm busy
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy
+1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (0) H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 450 I'm busy
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 550 Go away
+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 <CALLER@test.ex> F=<> R=all T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userx@domain1 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** usery@domain2 F=<CALLER@test.ex> R=others T=smtp H=localhost4.test.ex [127.0.0.1]: SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> F=<> R=all T=local_delivery
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
new file mode 100644
index 000000000..bde98db7d
--- /dev/null
+++ b/test/mail/4700.CALLER
@@ -0,0 +1,131 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Return-path: <>
+Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
+	id 10HmaY-0005vi-00
+	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: userx@domain1
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: CALLER@test.ex
+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: <E10HmaY-0005vi-00@the.local.host.name>
+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:
+
+  userx@domain1
+  host localhost4.test.ex [127.0.0.1]
+    SMTP error from remote mail server after initial connection:
+    550 Go away
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;userx@domain1
+Status: 5.0.0
+Remote-MTA: dns; localhost4.test.ex
+Remote-MTA: X-ip; [127.0.0.1]:1111
+X-Remote-MTA-smtp-greeting: X-str; 550 Go away
+X-Exim-Diagnostic: X-str; SMTP error from remote mail server after initial connection: 550 Go away
+Diagnostic-Code: smtp; 550 Go away
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
+
+Return-path: <CALLER@test.ex>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaX-0005vi-00
+	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 1
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Return-path: <>
+Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
+	id 10HmbA-0005vi-00
+	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: usery@domain2,
+  userx@domain1
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@test.ex>
+To: CALLER@test.ex
+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: <E10HmbA-0005vi-00@the.local.host.name>
+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:
+
+  usery@domain2
+  host localhost4.test.ex [127.0.0.1]
+    SMTP error from remote mail server after HELO the.local.host.name:
+    550 Go away
+  userx@domain1
+  host localhost4.test.ex [127.0.0.1]
+    SMTP error from remote mail server after HELO the.local.host.name:
+    550 Go away
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;userx@domain1
+Status: 5.0.0
+Remote-MTA: dns; localhost4.test.ex
+Remote-MTA: X-ip; [127.0.0.1]:1111
+X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
+X-Remote-MTA-helo-response: X-str; 550 Go away
+X-Exim-Diagnostic: X-str; SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
+Diagnostic-Code: smtp; 550 Go away
+
+Action: failed
+Final-Recipient: rfc822;usery@domain2
+Status: 5.0.0
+Remote-MTA: dns; localhost4.test.ex
+Remote-MTA: X-ip; [127.0.0.1]:1111
+X-Remote-MTA-smtp-greeting: X-str; 220 Connected OK
+X-Remote-MTA-helo-response: X-str; 550 Go away
+X-Exim-Diagnostic: X-str; SMTP error from remote mail server after HELO the.local.host.name: 550 Go away
+Diagnostic-Code: smtp; 550 Go away
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
+
+Return-path: <CALLER@test.ex>
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+	(envelope-from <CALLER@test.ex>)
+	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+Test message 2
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/scripts/4700-dsn-info/4700 b/test/scripts/4700-dsn-info/4700
new file mode 120000
index 000000000..e480f3494
--- /dev/null
+++ b/test/scripts/4700-dsn-info/4700
@@ -0,0 +1 @@
+../0000-Basic/0211
\ No newline at end of file
diff --git a/test/scripts/4700-dsn-info/REQUIRES b/test/scripts/4700-dsn-info/REQUIRES
new file mode 100644
index 000000000..683fc9019
--- /dev/null
+++ b/test/scripts/4700-dsn-info/REQUIRES
@@ -0,0 +1 @@
+support Experimental_DSN_info
diff --git a/test/stdout/4700 b/test/stdout/4700
new file mode 100644
index 000000000..446203b4f
--- /dev/null
+++ b/test/stdout/4700
@@ -0,0 +1,34 @@
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+450 I'm busy
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Connected OK
+EHLO the.local.host.name
+450 I'm busy
+HELO the.local.host.name
+450 I'm busy
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+550 Go away
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Connected OK
+EHLO the.local.host.name
+550 Go away
+HELO the.local.host.name
+550 Go away
+QUIT
+250 OK
+End of script