Testuite: tidying

[exim.git] / test / confs / 5500

diff --git a/test/confs/5500 b/test/confs/5500
index 6b9e328baa9dd47aabad7907cf18e81399accc09..f1a088d42b98f40129349b985ec9f69f3060c8ba 100644 (file)
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -10,6 +10,7 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

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


@@ -22,6 +23,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


@@ -30,6 +32,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


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

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

 # End
 # End