diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-07-07 21:51:13 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-07-08 01:13:42 +0100 |
commit | 6e69d78e612ade9d9bb052abeb4b113984995710 (patch) | |
tree | 263fd648e6e14598614248079160ff480d72152c /test/confs | |
parent | 55240832db97f7a16fd6ef2e2bb8d899897a1347 (diff) |
Testsuite: cutthrough vs. callout cache
Diffstat (limited to 'test/confs')
-rw-r--r-- | test/confs/5402 | 39 | ||||
-rw-r--r--[l---------] | test/confs/5403 | 71 | ||||
l--------- | test/confs/5404 | 1 |
3 files changed, 82 insertions, 29 deletions
diff --git a/test/confs/5402 b/test/confs/5402 index e480b64b5..2c1038015 100644 --- a/test/confs/5402 +++ b/test/confs/5402 @@ -1,4 +1,4 @@ -# Exim test configuration 5400 +# Exim test configuration 5402 exim_path = EXIM_PATH keep_environment = @@ -10,44 +10,33 @@ gecos_pattern = "" gecos_name = CALLER_NAME tls_advertise_hosts = -log_selector = +received_recipients - # ----- Main settings ----- domainlist local_domains = test.ex : *.test.ex -acl_smtp_rcpt = ar - +acl_smtp_rcpt = acl_rcpt -# ----- ACLs ----- +# ----- ACLs ------- begin acl -ar: - warn control = cutthrough_delivery - logwrite = rcpt for $local_part@$domain - warn condition = ${if eq {verify}{$local_part}} - verify = recipient/callout=use_sender - accept +acl_rcpt: +.ifdef OPT + warn control = cutthrough_delivery +.endif + accept verify = recipient/callout=use_sender + # ----- Routers ----- begin routers -dns: - driver = dnslookup - domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex - self = send - transport = smtp - all: driver = manualroute domains = ! +local_domains - route_list = special.com HOSTIPV4 ; * 127.0.0.1 + route_list = * 127.0.0.1 self = send - transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}} - headers_remove = X-hdr-rtr - headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++ + transport = smtp no_more @@ -59,12 +48,6 @@ smtp: driver = smtp interface = HOSTIPV4 port = PORT_S - headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} - -smtp2: - driver = smtp - interface = HOSTIPV4 - port = PORT_S # End diff --git a/test/confs/5403 b/test/confs/5403 index 8f6811b7e..70ec647d0 120000..100644 --- a/test/confs/5403 +++ b/test/confs/5403 @@ -1 +1,70 @@ -5400
\ No newline at end of file +# Exim test configuration 5403 + +exim_path = EXIM_PATH +keep_environment = +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +log_selector = +received_recipients + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = ar + + +# ----- ACLs ----- + +begin acl + +ar: + warn control = cutthrough_delivery + logwrite = rcpt for $local_part@$domain + warn condition = ${if eq {verify}{$local_part}} + verify = recipient/callout=use_sender + accept + +# ----- Routers ----- + +begin routers + +dns: + driver = dnslookup + domains = localhost.test.ex : localhost4.test.ex : thishost.test.ex + self = send + transport = smtp + +all: + driver = manualroute + domains = ! +local_domains + route_list = special.com HOSTIPV4 ; * 127.0.0.1 + self = send + transport = ${if eq {special_tpt}{$local_part} {smtp2}{smtp}} + headers_remove = X-hdr-rtr + headers_add = X-hdr-rtr-new: $h_X-hdr-rtr:+++ + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + headers_add = ${if def:h_X-hdr-rtr {X-hdr-tpt-new: new} {}} + +smtp2: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + + +# End diff --git a/test/confs/5404 b/test/confs/5404 new file mode 120000 index 000000000..8f6811b7e --- /dev/null +++ b/test/confs/5404 @@ -0,0 +1 @@ +5400
\ No newline at end of file |