SMTP WELLKNOWN extension

[exim.git] / test / stderr / 0396

diff --git a/test/stderr/0396 b/test/stderr/0396
index 072e3d49756e94ad80f081b9cb527b281c8bd23e..75b64878a23050b374ec019329b038e4c192521c 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -1,34 +1,42 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 set_process_info: pppp accepting a local SMTP message from <CALLER@the.local.host.name>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 set_process_info: pppp accepting a local SMTP message from <CALLER@the.local.host.name>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

-SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 the.local.host.name Hello CALLER at test

 SMTP<< mail from:<x@y>
 SMTP<< mail from:<x@y>

-SMTP>> 250 OK\r
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
+SMTP>> 250 OK

 SMTP<< rcpt to:<x@y>
 SMTP<< rcpt to:<x@y>

-processing "accept"
+processing "accept" (TESTSUITE/test-config 12)

 check domains = +fail
 check domains = +fail

-expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+y in "+fail"?
+ list element: +fail
+  start sublist fail
+   expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+  end sublist fail

 y in "+fail"? no (end of list)
 y in "+fail"? no (end of list)

-accept: condition test failed
+accept: condition test failed in inline ACL

 end of inline ACL: implicit DENY
 end of inline ACL: implicit DENY

-SMTP>> 550 Administrative prohibition\r
+SMTP>> 550 Administrative prohibition

 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <x@y>
 created log directory TESTSUITE/spool/log
 SMTP<< quit
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <x@y>
 created log directory TESTSUITE/spool/log
 SMTP<< quit

-SMTP>> 221 the.local.host.name closing connection\r
+SMTP>> 221 the.local.host.name closing connection

 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 search_tidyup called
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>