updates to test suite - roll back lookup changes after dkim lookup removed, strip...

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

diff --git a/test/stderr/0398 b/test/stderr/0398
index e661fcb6c8dc37581f27b2a9fcde1b8eac553d83..5a151153f7f05e690a6bcf48e664023568d62308 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"
@@ -151,7 +153,7 @@ 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
+SMTP>> 250 Accepted
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
 processing "deny"
@@ -228,9 +230,9 @@ 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
+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