X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/ea89660dc06ba1f1e919bd0d6564619831d64167..213da388e7834c078ed5fd2e0063c951db0d8080:/test/stderr/0022 diff --git a/test/stderr/0022 b/test/stderr/0022 index c558b4226..510c5499a 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -30,13 +30,12 @@ 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 -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called @@ -53,8 +52,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 -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 @@ -64,7 +61,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 (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -97,16 +94,15 @@ 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 -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called @@ -123,8 +119,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 -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 @@ -134,7 +128,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 (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -167,14 +161,13 @@ 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 -DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called @@ -194,8 +187,6 @@ P Received: from [V4NET.9.8.7] >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: warn user message >> -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 @@ -205,7 +196,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 (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (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) @@ -216,17 +207,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 @@ -242,7 +233,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" @@ -259,19 +250,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 @@ -285,7 +276,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< @@ -293,7 +284,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< @@ -301,7 +292,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") @@ -310,7 +301,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) @@ -356,10 +347,10 @@ 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" +>>> processing "drop" (TESTSUITE/test-config 41) >>> message: forcibly dropped >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP @@ -377,10 +368,10 @@ 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" +>>> processing "drop" (TESTSUITE/test-config 41) >>> message: forcibly dropped >>> drop: condition test succeeded in ACL "drop" >>> end of ACL "drop": DROP