X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/f926e27276301de1e2fd011b7edcd1b85d8c4754..148d9d517265b06fee1ac15047040e3f1789f280:/test/confs/5500?ds=sidebyside diff --git a/test/confs/5500 b/test/confs/5500 index 6b9e328ba..91dc4275d 100644 --- a/test/confs/5500 +++ b/test/confs/5500 @@ -3,13 +3,9 @@ LOG_SELECTOR= -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/std_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -22,6 +18,7 @@ trusted_users = CALLER prdr_enable = true +acl_smtp_mail = mail_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 +mail_acl: + accept logwrite = prdr_requested: <$prdr_requested> + prdr_acl: defer local_parts = usery deny local_parts = userz @@ -45,7 +45,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Routers ----- @@ -56,10 +56,4 @@ r0: driver = accept transport = t1 -# ----- Retry ----- - -begin retry - -* * F,5d,5m - # End