Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 5500

diff --git a/test/confs/5500 b/test/confs/5500
index 6b9e328baa9dd47aabad7907cf18e81399accc09..91dc4275d3fd9d9246f38d95e09e9df45fe2458c 100644 (file)
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -3,13 +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

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

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


@@ -22,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


@@ -30,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


@@ -45,7 +45,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 # ----- Routers -----
   user = CALLER
 
 # ----- Routers -----


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

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

 # End
 # End