X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4fab92fbc2b63bac2d89c1dae69fa1845cb640b7..b0e63c7efdc2133c61545b051042d3617ecd2bbd:/test/stderr/0371?ds=sidebyside diff --git a/test/stderr/0371 b/test/stderr/0371 index 1cdf00177..9105d6473 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -1,10 +1,10 @@ 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 - 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@test.ex sender_fullhost = [V4NET.0.0.0] @@ -21,7 +21,7 @@ host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) using ACL "connect" -processing "accept" +processing "accept" (TESTSUITE/test-config 23) check set acl_c0 = $acl_c0; connect = ; connect check set acl_c9 = $acl_c9; connect @@ -31,23 +31,30 @@ end of ACL "connect": ACCEPT SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< ehlo something +something in helo_lookup_domains? + list element: @ + list element: @[] something in helo_lookup_domains? no (end of list) sender_fullhost = (something) [V4NET.0.0.0] sender_rcvhost = [V4NET.0.0.0] (helo=something) set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0] host in dsn_advertise_hosts? no (option unset) -host in pipelining_advertise_hosts? yes (matched "*") +host in pipelining_advertise_hosts? + list element: * + host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? host in chunking_advertise_hosts? no (end of list) SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] -250-SIZE 52428800 -250-8BITMIME -250-PIPELINING -250 HELP + 250-SIZE 52428800 + 250-8BITMIME + 250-VRFY + 250-PIPELINING + 250 HELP SMTP<< mail from: 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 using ACL "mail" -processing "accept" +processing "accept" (TESTSUITE/test-config 27) check set acl_c0 = $acl_c0; mail = ; connect; mail check set acl_c9 = $acl_c9; mail @@ -59,7 +66,7 @@ end of ACL "mail": ACCEPT SMTP>> 250 OK SMTP<< rcpt to: using ACL "rcpt" -processing "accept" +processing "accept" (TESTSUITE/test-config 32) check set acl_m0 = $acl_m0; rcpt = ; mail; rcpt check set acl_m9 = $acl_m9; rcpt @@ -69,41 +76,44 @@ check set acl_c0 = $acl_c0; rcpt accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT SMTP>> 250 Accepted -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called >>Headers received: +qualify & rewrite recipients list +global rewrite rules +rewrite headers search_tidyup called >>Headers after rewriting and local additions: -Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from [V4NET.0.0.0] (helo=something) by mail.test.ex with esmtp (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 - for x@y; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmaX-000000005vi-0000 + for x@y; + Tue, 2 Mar 1999 09:44:33 +0000 using ACL "data" -processing "accept" +processing "accept" (TESTSUITE/test-config 37) check set acl_m0 = $acl_m0; data = ; mail; rcpt; data check set acl_m9 = $acl_m9; data = ; rcpt; data accept: condition test succeeded in ACL "data" end of ACL "data": ACCEPT -calling local_scan(); timeout=300 -local_scan() returned 0 NULL LOG: MAIN <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-000000005vi-0000 smtp_setup_msg entered SMTP<< vrfy x@y -host in smtp_accept_max_nonmail_hosts? yes (matched "*") +host in smtp_accept_max_nonmail_hosts? + list element: * + host in smtp_accept_max_nonmail_hosts? yes (matched "*") using ACL "vrfy" -processing "accept" +processing "accept" (TESTSUITE/test-config 41) check set acl_c0 = $acl_c0; vrfy = ; connect; mail; rcpt; vrfy check set acl_c9 = $acl_c9; vrfy @@ -126,7 +136,7 @@ SMTP<< mail from: 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 using ACL "mail" -processing "accept" +processing "accept" (TESTSUITE/test-config 27) check set acl_c0 = $acl_c0; mail = ; connect; mail; rcpt; vrfy; mail check set acl_c9 = $acl_c9; mail @@ -139,6 +149,6 @@ SMTP>> 250 OK SMTP<< quit SMTP>> 221 mail.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (something) [V4NET.0.0.0] closed by QUIT + SMTP connection from (something) [V4NET.0.0.0] D=qqs closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>