Merge branch '4.next'

[users/jgh/exim.git] / test / confs / 5402

diff --git a/test/confs/5402 b/test/confs/5402
index e480b64b5c8a53ab9cd6670cd886f8a3c4f6c2f9..0984e0cc94a95a9f0bca969f3c2206e189df62c6 100644 (file)
--- 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
 
 
 # ----- Main settings -----
 
 domainlist local_domains = test.ex : *.test.ex
 

-acl_smtp_rcpt = ar
-
+acl_smtp_rcpt = acl_rcpt

 
 

-# ----- ACLs -----
+# ----- ACLs -------

 
 begin acl
 
 
 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
 
 
 # ----- 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
 all:
   driver = manualroute
   domains = ! +local_domains

-  route_list = special.com HOSTIPV4 ; * 127.0.0.1
+  route_list = * 127.0.0.1

   self = send
   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
 
 
   no_more
 
 


@@ -59,12 +42,6 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_S
   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
 
 
 # End