Fix bug 1229.

[exim.git] / test / stderr / 3400

diff --git a/test/stderr/3400 b/test/stderr/3400
index 573d3afeec68c1a60dc8925d8763aa94843dca88..80b80f05e49b13ae38ae3aa5c2d30d593e15ce08 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -122,7 +122,7 @@ LOG: H=(test.host) [10.0.0.1] rejected ETRN abcd: authentication required
 >>> check !authenticated = *
 >>> deny: condition test succeeded
 LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@test.ex>: authentication required
->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:
 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""
@@ -187,7 +187,7 @@ LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@te
 >>> accept: condition test failed
 >>> processing "deny"
 >>> deny: condition test succeeded
-LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cus.cam.ac.uk>: relay not permitted
+LOG: H=(test.host) [10.0.0.1] F=<junk@jink.jonk.test.ex> A=mylogin rejected RCPT <userx@cus.cam.ac.uk>: relay not permitted
 >>> using ACL "check_vrfy"
 >>> processing "deny"
 >>> check hosts = +auth_hosts
@@ -294,7 +294,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd
 >>> accept: condition test failed
 >>> accept: endpass encountered - denying access
 LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cus.cam.ac.uk>: authentication required
->>> mylogin authenticator:
+>>> mylogin authenticator server_condition:
 >>>   $auth1 = userx secret
 >>>   $1 = userx secret
 >>> +++MYLOGIN $1="userx secret" $2="" $3=""
@@ -354,17 +354,21 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-finduser used cached passwd data for CALLER
+seeking password data for user "CALLER": using cached result
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 sender_fullhost = [10.0.0.5]
 sender_rcvhost = [10.0.0.5] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [10.0.0.5] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -383,7 +387,7 @@ host in "10.0.0.6"? no (end of list)
 warn: condition test failed
 processing "accept"
 accept: condition test succeeded
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo testing.testing
 testing.testing in helo_lookup_domains? no (end of list)
@@ -395,22 +399,22 @@ host in "10.0.0.1"? no (end of list)
 host in "10.0.0.4"? no (end of list)
 host in "10.0.0.3 : 10.0.0.4"? no (end of list)
 host in auth_advertise_hosts? yes (matched "10.0.0.5")
-SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]\r
-250-SIZE 52428800\r
-250-ETRN\r
-250-EXPN\r
-250-PIPELINING\r
-250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN\r
-250 HELP\r
+SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
+250 HELP
 SMTP<< auth mylogin dXNlcnggc2VjcmV0
-mylogin authenticator:
+mylogin authenticator server_condition:
   $auth1 = userx secret
   $1 = userx secret
 +++MYLOGIN $1="userx secret" $2="" $3=""
 expanded string: yes
-SMTP>> 235 Authentication succeeded\r
+SMTP>> 235 Authentication succeeded
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called