X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstderr%2F0022;h=0a8373383db159782229bf1fda320485b4d589b7;hb=8d2cbee4bb479e11fd3dfa0acd8ac547a98f12f8;hp=e3269500f7d04d4f593854b665d046b6040567a0;hpb=bd8fbe3606d80e5a3fc02fe71b521146c6938448;p=exim.git diff --git a/test/stderr/0022 b/test/stderr/0022 index e3269500f..0a8373383 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: accept propagating DSN 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 @@ -31,9 +30,9 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_empty" -processing "warn" +processing "warn" (TESTSUITE/test-config 29) warn: condition test succeeded in ACL "warn_empty" -processing "accept" +processing "accept" (TESTSUITE/test-config 30) accept: condition test succeeded in ACL "warn_empty" end of ACL "warn_empty": ACCEPT SMTP>> 250 Accepted @@ -41,9 +40,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -57,9 +53,6 @@ P Received: from [V4NET.9.8.7] (envelope-from ) id 10HmbF-0005vi-00 for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} -calling local_scan(); timeout=300 -local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbF-0005vi-00 @@ -69,7 +62,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -77,7 +70,6 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: accept propagating DSN 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 @@ -103,12 +95,12 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_log" -processing "warn" +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 -processing "accept" +processing "accept" (TESTSUITE/test-config 34) accept: condition test succeeded in ACL "warn_log" end of ACL "warn_log": ACCEPT SMTP>> 250 Accepted @@ -116,9 +108,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -132,9 +121,6 @@ P Received: from [V4NET.9.8.7] (envelope-from ) id 10HmbG-0005vi-00 for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -PDKIM >> raw hdr: quit{CR}{LF} -calling local_scan(); timeout=300 -local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbG-0005vi-00 @@ -144,7 +130,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -152,7 +138,6 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp -DSN: accept propagating DSN 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 @@ -178,10 +163,10 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to: using ACL "warn_user" -processing "warn" +processing "warn" (TESTSUITE/test-config 37) message: warn user message warn: condition test succeeded in ACL "warn_user" -processing "accept" +processing "accept" (TESTSUITE/test-config 38) accept: condition test succeeded in ACL "warn_user" end of ACL "warn_user": ACCEPT SMTP>> 250 Accepted @@ -189,9 +174,6 @@ DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called -PDKIM >> raw hdr: {CR}{LF} -PDKIM >> raw hdr: Testing{CR}{LF} -PDKIM >> raw hdr: .{CR}{LF} >>Headers received: search_tidyup called @@ -208,9 +190,6 @@ P Received: from [V4NET.9.8.7] >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: warn user message >> -PDKIM >> raw hdr: quit{CR}{LF} -calling local_scan(); timeout=300 -local_scan() returned 0 NULL LOG: MAIN <= x@y H=[V4NET.9.8.7] P=smtp S=sss SMTP>> 250 OK id=10HmbH-0005vi-00 @@ -220,7 +199,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) 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) @@ -231,17 +210,17 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "defer" ->>> processing "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 >>> using ACL "accept" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 24) >>> accept: condition test succeeded in ACL "accept" >>> end of ACL "accept": ACCEPT >>> using ACL "drop" ->>> processing "drop" +>>> processing "drop" (TESTSUITE/test-config 41) >>> message: forcibly dropped >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP @@ -257,7 +236,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "defer_senders" ->>> processing "defer" +>>> processing "defer" (TESTSUITE/test-config 54) >>> check senders = : >>> in ":"? yes (matched "") >>> defer: condition test succeeded in ACL "defer_senders" @@ -274,19 +253,19 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "delay_accept" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 57) >>> check delay = 1s >>> delay modifier requests 1-second delay >>> delay skipped in -bh checking mode >>> accept: condition test succeeded in ACL "delay_accept" >>> end of ACL "delay_accept": ACCEPT >>> using ACL "delay_warn" ->>> processing "warn" +>>> processing "warn" (TESTSUITE/test-config 60) >>> check delay = 1s >>> delay modifier requests 1-second delay >>> delay skipped in -bh checking mode >>> warn: condition test succeeded in ACL "delay_warn" ->>> processing "accept" +>>> 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 @@ -300,7 +279,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "host_check" ->>> processing "deny" +>>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") >>> message: host data >$host_data< @@ -308,7 +287,7 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> end of ACL "host_check": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check" ->>> processing "deny" +>>> processing "deny" (TESTSUITE/test-config 71) >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") >>> message: host data >$host_data< @@ -316,7 +295,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-spe >>> end of ACL "host_check": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" ->>> processing "deny" +>>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< >>> check hosts = +some_hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") @@ -325,7 +304,7 @@ LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-spe >>> end of ACL "host_check2": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" ->>> processing "deny" +>>> processing "deny" (TESTSUITE/test-config 75) >>> message: host data >$host_data< >>> check hosts = +some_hosts >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached) @@ -371,13 +350,13 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "nested_drop" ->>> processing "accept" +>>> processing "accept" (TESTSUITE/test-config 44) >>> check acl = drop ->>> using ACL "drop" ->>> processing "drop" ->>> message: forcibly dropped ->>> drop: condition test succeeded in ACL "drop" ->>> end of ACL "drop": DROP +>>> using ACL "drop" +>>> processing "drop" (TESTSUITE/test-config 41) +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> 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 @@ -392,13 +371,13 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "nested_drop_require" ->>> processing "require" +>>> processing "require" (TESTSUITE/test-config 48) >>> check acl = drop ->>> using ACL "drop" ->>> processing "drop" ->>> message: forcibly dropped ->>> drop: condition test succeeded in ACL "drop" ->>> end of ACL "drop": DROP +>>> using ACL "drop" +>>> processing "drop" (TESTSUITE/test-config 41) +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> 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