Fix "-bP smtp_receive_timeout". Bug 2384

[exim.git] / test / confs / 5500

diff --git a/test/confs/5500 b/test/confs/5500
index 1bc830ef41a1a332d58fb85dde8b188cd79dda35..1b25be1f8471ac0e52a235e41a1e0e98b4f74172 100644 (file)
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -3,14 +3,9 @@
 
 LOG_SELECTOR=
 
 
 LOG_SELECTOR=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -23,6 +18,7 @@ trusted_users = CALLER
 
 prdr_enable = true
 
 
 prdr_enable = true
 

+acl_smtp_mail = mail_acl

 acl_smtp_rcpt = accept
 acl_smtp_data_prdr = prdr_acl
 acl_smtp_data = data_acl
 acl_smtp_rcpt = accept
 acl_smtp_data_prdr = prdr_acl
 acl_smtp_data = data_acl


@@ -31,6 +27,9 @@ acl_smtp_data = data_acl
 
 begin acl
 
 
 begin acl
 

+mail_acl:
+  accept logwrite = prdr_requested: <$prdr_requested>
+

 prdr_acl:
   defer        local_parts = usery
   deny local_parts = userz
 prdr_acl:
   defer        local_parts = usery
   deny local_parts = userz


@@ -57,10 +56,4 @@ r0:
   driver = accept
   transport = t1
 
   driver = accept
   transport = t1
 

-# ----- Retry -----
-
-begin retry
-
-*                *   F,5d,5m
-

 # End
 # End