Fix "-bP smtp_receive_timeout". Bug 2384

[users/heiko/exim.git] / test / confs / 0098

diff --git a/test/confs/0098 b/test/confs/0098
index 60402deaf362a4a8c18d5f233bcc553dd383bef4..719971c9cf377002c2fa5ed3006201e0327b2671 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,20 +2,15 @@
 
 WMF=
 
 
 WMF=
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-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
+

 
 # ----- Main settings -----
 
 qualify_domain = test.ex
 
 domainlist local_domains = test.ex : another.test.ex
 
 # ----- Main settings -----
 
 qualify_domain = test.ex
 
 domainlist local_domains = test.ex : another.test.ex

+acl_smtp_rcpt = server_acl

 
 delay_warning = 10s:40s:10m
 
 
 delay_warning = 10s:40s:10m
 


@@ -30,6 +25,14 @@ queue_run_in_order
 WMF
 
 
 WMF
 
 

+# ----- ACL -----
+
+# Only used in server mode
+begin acl
+server_acl:
+  defer        message = Over-quota
+
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -41,6 +44,12 @@ refused:
   self = send
   transport = smtp_connect_refused
 
   self = send
   transport = smtp_connect_refused
 

+remote_quota:
+  driver =     manualroute
+  route_list = remote.defer 127.0.0.1
+  self =       send
+  transport =  smtp
+

 # The IP address is deliberately V4NET.0.0.1 so as to be unreachable
 all:
   driver = manualroute
 # The IP address is deliberately V4NET.0.0.1 so as to be unreachable
 all:
   driver = manualroute


@@ -82,6 +91,7 @@ local_delivery:
 smtp:
   driver = smtp
   connect_timeout = 1s
 smtp:
   driver = smtp
   connect_timeout = 1s

+  port = PORT_D

 
 smtp_connect_refused:
   driver = smtp
 
 smtp_connect_refused:
   driver = smtp