Ensure that recipient is well-defined for expansion-called acl at RCPT-time.

[users/heiko/exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index f02458c391c8be9ec80fd897ed5b3c0204c06798..4e97f4e000a55f261ece31cf5387ba86fdaaa598 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -21,7 +21,7 @@ SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender


@@ -70,7 +70,7 @@ sender qq@remote verified ok
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout


@@ -126,7 +126,8 @@ callout cache: no address record found
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready

-  SMTP>> HELO mail.test.ex
+127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+  SMTP>> EHLO mail.test.ex

   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK


@@ -149,7 +150,7 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
 processing "accept"
 check senders = qq@remote
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
 processing "accept"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"


@@ -158,7 +159,7 @@ SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote
 using ACL "rcpt"
 processing "deny"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender


@@ -166,7 +167,7 @@ using cached sender verify result
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender/callout


@@ -226,7 +227,7 @@ LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept"
 check senders = qq@remote
   U=CALLER Warning: Sender verify failed
 processing "accept"
 check senders = qq@remote

-address match: subject=qq@remote pattern=qq@remote
+address match test: subject=qq@remote pattern=qq@remote

 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 accept: condition test succeeded in ACL "rcpt"