diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2013-07-21 12:50:53 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2013-07-21 16:57:18 +0100 |
| commit | cb46fd2b91514ce49ad0e13788127d756ed35145 (patch) | |
| tree | 6e698fe65ce2c462c7ce0c3ee938463388e87fc1 /test/stderr | |
| parent | ada4d84efd985590d24a988912b8b38cd91c6e59 (diff) | |
Remove ACL-config skip so that ${acl } expansions work from queue-runs.
Previously we skipped parsing the ACL section when not needed. Now it is
potentially needed in all cases. The skip was ~5% faster than a full parse
so probably not a large part of the exim process startup.
Fix up testsuite output files affected by the removal and add a regression test.
Diffstat (limited to 'test/stderr')
| -rw-r--r-- | test/stderr/0021 | 1 | ||||
| -rw-r--r-- | test/stderr/0218 | 25 | ||||
| -rw-r--r-- | test/stderr/2600 | 1 | ||||
| -rw-r--r-- | test/stderr/5400 | 1 |
4 files changed, 25 insertions, 3 deletions
diff --git a/test/stderr/0021 b/test/stderr/0021 index 4f43e05c9..64c72d2bf 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -176,7 +176,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed x in "!bad"? yes (end of list) LOG: MAIN => x <x@y> R=accept T=appendfile diff --git a/test/stderr/0218 b/test/stderr/0218 index 67ae81ee6..bf0176256 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -6,9 +6,15 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories delivering 10HmaX-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) delivering 10HmaY-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) queue running combined directories delivering 10HmaX-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -31,6 +37,8 @@ configuration file is TESTSUITE/test-config trusted user admin user delivering 10HmaY-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> SMTP>> RCPT TO:<b@test.ex> SMTP>> DATA @@ -56,9 +64,15 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) delivering 10HmbA-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) queue running combined directories delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -83,6 +97,8 @@ LOG: MAIN LOG: MAIN Completed delivering 10HmbA-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN 127.0.0.1 [127.0.0.1] Connection refused @@ -97,7 +113,10 @@ admin user LOG: queue_run MAIN Start queue run: pid=pppp -qqf delivering 10HmbA-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) delivering 10HmbB-0005vi-00 (queue run pid ppppp) +R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard LOG: MAIN @@ -105,7 +124,11 @@ LOG: MAIN LOG: MAIN Completed delivering 10HmbC-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) delivering 10HmbA-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex @@ -135,6 +158,8 @@ configuration file is TESTSUITE/test-config trusted user admin user delivering 10HmbC-0005vi-00 (queue run pid ppppp) +R: client (ACL) +T: send_to_server (ACL) SMTP>> MAIL FROM:<CALLER@test.ex> SMTP>> RCPT TO:<c@test.ex> SMTP>> DATA diff --git a/test/stderr/2600 b/test/stderr/2600 index 2df984486..57026026d 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -319,7 +319,6 @@ changed uid/gid: forcing real = effective configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages diff --git a/test/stderr/5400 b/test/stderr/5400 index bc3dba5dd..73934dd92 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -125,7 +125,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@domain.com <-------- smtp transport entered |