deliver

[users/heiko/exim.git] / test / scripts / 4015-scan-ipv6 / 4015

diff --git a/test/scripts/4015-scan-ipv6/4015 b/test/scripts/4015-scan-ipv6/4015
index 66db933e623fe536f9d53f21132895c64e89d08e..9e4a857be5bc86a1b758afb61428facd5649346a 100644 (file)
--- a/test/scripts/4015-scan-ipv6/4015
+++ b/test/scripts/4015-scan-ipv6/4015
@@ -7,14 +7,14 @@ server 7833
 <User:
 <Content-length:
 <
 <User:
 <Content-length:
 <

-<From 
+<From

 <X-Envelope-From
 <X-Envelope-To
 <X-Envelope-From
 <X-Envelope-To

-<Received: 
-<      by 
+<Received:
+<      by

 <      (envelope
 <      (envelope

-<      id 
-<      for 
+<      id
+<      for

 <Content-type: text/plain
 <Message-Id:
 <From:
 <Content-type: text/plain
 <Message-Id:
 <From:


@@ -30,7 +30,7 @@ server 7833
 >similar future email.  If you have any questions, see
 >@@CONTACT_ADDRESS@@ for details.
 >
 >similar future email.  If you have any questions, see
 >@@CONTACT_ADDRESS@@ for details.
 >

->Content preview:  test [...] 
+>Content preview:  test [...]

 >
 >Content analysis details:   (4.5 points, 5.0 required)
 >
 >
 >Content analysis details:   (4.5 points, 5.0 required)
 >


@@ -45,9 +45,10 @@ server 7833
 >
 *eof
 ****
 >
 *eof
 ****

-exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s'
+# need to trust CALLER to -oMt
+exim -odi -oMt fromuser -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s'

 ehlo test.ex
 ehlo test.ex

-mail from:<>
+mail from:<fromuser@myhost.test.ex>

 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain
 rcpt to:<userx@test.ex>
 data
 Content-type: text/plain