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/confs | |
| 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/confs')
| -rw-r--r-- | test/confs/0218 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/confs/0218 b/test/confs/0218 index a585870ef..4458e1846 100644 --- a/test/confs/0218 +++ b/test/confs/0218 @@ -19,6 +19,13 @@ queue_run_in_order queue_only +# ----- ACLs ---- + +begin acl + +expand_check: + accept message = ACL + # ----- Routers ----- begin routers @@ -30,11 +37,13 @@ bounce: data = :fail: just discard retry_use_local_part senders = : + debug_print = R: $router_name (${acl {expand_check}}) client: driver = accept retry_use_local_part transport = send_to_server + debug_print = R: $router_name (${acl {expand_check}}) # ----- Transports ----- @@ -47,6 +56,7 @@ send_to_server: command_timeout = 1s hosts = 127.0.0.1 port = PORT_S + debug_print = T: $transport_name (${acl {expand_check}}) # ----- Retry ----- |