Merge branch 'master' of git://git.exim.org/exim

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

diff --git a/test/stderr/0398 b/test/stderr/0398
index e661fcb6c8dc37581f27b2a9fcde1b8eac553d83..f02458c391c8be9ec80fd897ed5b3c0204c06798 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,16 +5,18 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@test.ex>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<qq@remote>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
 processing "deny"
@@ -65,7 +67,7 @@ routed by r2 router
   host 127.0.0.1 [127.0.0.1]
 ----------- end verify ------------
 sender qq@remote verified ok
-deny: condition test failed
+deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
@@ -142,7 +144,7 @@ wrote callout cache domain record:
 dbfn_write: key=qq@remote
 wrote negative callout cache address record
 ----------- end verify ------------
-warn: condition test succeeded
+warn: condition test succeeded in ACL "rcpt"
 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"
@@ -150,8 +152,8 @@ check senders = qq@remote
 address match: 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
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "rcpt"
+SMTP>> 250 Accepted
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny"
@@ -161,7 +163,7 @@ remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
-deny: condition test failed
+deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
@@ -219,7 +221,7 @@ dbfn_read: key=qq@remote
 callout cache: found address record
 callout cache: address record is negative
 ----------- end verify ------------
-warn: condition test succeeded
+warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept"
@@ -227,10 +229,10 @@ check senders = qq@remote
 address match: 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
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "rcpt"
+SMTP>> 250 Accepted
 SMTP<< quit
-SMTP>> 221 mail.test.ex closing connection\r
+SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called