X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/eae427c645a7d0e2051b0600d2e4235789740132..f5730918ef684baafbd9e606a1d4eb06914563cc:/test/stderr/0022?ds=sidebyside diff --git a/test/stderr/0022 b/test/stderr/0022 index dc0e12575..91f600d46 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -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=p1235 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=p1235 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 @@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.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 @@ -41,35 +47,38 @@ 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//10HmbF-0005vi-00-D Data file written for message 10HmbF-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbF-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1236 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=p1236 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 @@ -89,6 +98,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.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 @@ -99,7 +114,7 @@ processing "warn" (TESTSUITE/test-config 33) l_message: warn log message warn: condition test succeeded in ACL "warn_log" LOG: MAIN - H=[V4NET.9.8.7] Warning: warn log message + H=(test) [V4NET.9.8.7] Warning: warn log message processing "accept" (TESTSUITE/test-config 34) accept: condition test succeeded in ACL "warn_log" end of ACL "warn_log": ACCEPT @@ -109,35 +124,38 @@ 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//10HmbG-0005vi-00-D Data file written for message 10HmbG-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbG-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1237 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=p1237 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 @@ -157,6 +175,12 @@ host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? no (end of list) +sender_fullhost = (test) [V4NET.9.8.7] +sender_rcvhost = [V4NET.9.8.7] (helo=test) +set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7] +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.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 @@ -175,13 +199,16 @@ 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//10HmbH-0005vi-00-D Data file written for message 10HmbH-0005vi-00 >>Generated Received: header line -P Received: from [V4NET.9.8.7] +P Received: from [V4NET.9.8.7] (helo=test) by myhost.test.ex with smtp (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 @@ -191,15 +218,15 @@ P Received: from [V4NET.9.8.7] X-ACL-Warn: warn user message >> LOG: MAIN - <= x@y H=[V4NET.9.8.7] P=smtp S=sss + <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbH-0005vi-00 smtp_setup_msg entered SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from [V4NET.9.8.7] closed by QUIT + SMTP connection from (test) [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -209,12 +236,13 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "defer" >>> processing "defer" (TESTSUITE/test-config 51) >>> message: forcibly deferred >>> defer: condition test succeeded in ACL "defer" >>> end of ACL "defer": DEFER -LOG: H=[V4NET.9.8.7] F= temporarily rejected RCPT : forcibly deferred +LOG: H=(test) [V4NET.9.8.7] F= temporarily rejected RCPT : forcibly deferred >>> using ACL "accept" >>> processing "accept" (TESTSUITE/test-config 24) >>> accept: condition test succeeded in ACL "accept" @@ -224,8 +252,8 @@ LOG: H=[V4NET.9.8.7] F= temporarily rejected RCPT : forcibly defer >>> message: forcibly dropped >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP -LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -235,14 +263,15 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "defer_senders" >>> processing "defer" (TESTSUITE/test-config 54) >>> check senders = : >>> in ":"? yes (matched "") >>> defer: condition test succeeded in ACL "defer_senders" >>> end of ACL "defer_senders": DEFER -LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -252,6 +281,7 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "delay_accept" >>> processing "accept" (TESTSUITE/test-config 57) >>> check delay = 1s @@ -268,7 +298,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> processing "accept" (TESTSUITE/test-config 61) >>> accept: condition test succeeded in ACL "delay_warn" >>> end of ACL "delay_warn": ACCEPT -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -278,6 +308,7 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "host_check" >>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts @@ -285,7 +316,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> message: host data >$host_data< >>> deny: condition test succeeded in ACL "host_check" >>> end of ACL "host_check": DENY -LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check" >>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts @@ -293,7 +324,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-spe >>> message: host data >$host_data< >>> deny: condition test succeeded in ACL "host_check" >>> end of ACL "host_check": DENY -LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< @@ -302,7 +333,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-spe >>> host in "+some_hosts"? yes (matched "+some_hosts") >>> deny: condition test succeeded in ACL "host_check2" >>> end of ACL "host_check2": DENY -LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< @@ -310,8 +341,8 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-sp >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached) >>> deny: condition test succeeded in ACL "host_check2" >>> end of ACL "host_check2": DENY -LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< -LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT LOG: smtp_connection MAIN SMTP connection from CALLER LOG: MAIN @@ -349,6 +380,7 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "nested_drop" >>> processing "accept" (TESTSUITE/test-config 44) >>> check acl = drop @@ -359,8 +391,8 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> end of ACL "drop": DROP >>> accept: condition test yielded "drop" in ACL "nested_drop" >>> accept: endpass encountered - denying access -LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -370,6 +402,7 @@ LOG: SMTP connection from [V4NET.9.8.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) +>>> test in helo_lookup_domains? no (end of list) >>> using ACL "nested_drop_require" >>> processing "require" (TESTSUITE/test-config 48) >>> check acl = drop @@ -380,7 +413,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> end of ACL "drop": DROP >>> require: condition test yielded "drop" in ACL "nested_drop_require" >>> end of ACL "nested_drop_require": not OK -LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped -LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL +LOG: H=(test) [V4NET.9.8.7] F= rejected RCPT : forcibly dropped +LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL ******** SERVER ********