X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/59eaad2b1af0dc58545dff6a7211948782811e1a..e5903596a0:/test/confs/5402?ds=inline diff --git a/test/confs/5402 b/test/confs/5402 index e480b64b5..0984e0cc9 100644 --- a/test/confs/5402 +++ b/test/confs/5402 @@ -1,53 +1,36 @@ -# Exim test configuration 5400 +# Exim test configuration 5402 -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 = +.include DIR/aux-var/std_conf_prefix -log_selector = +received_recipients +primary_hostname = myhost.test.ex # ----- 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 +42,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