X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..18a352ae8a799bb7be3a03b14bbf3ce9e0ba4945:/test/confs/0021?ds=sidebyside

diff --git a/test/confs/0021 b/test/confs/0021
index 902d5f369..0150839b4 100644
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -1,15 +1,12 @@
 # Exim test configuration 0021
 
 SERVER=
+BR=
+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -24,6 +21,9 @@ acl_smtp_helo = helo
 acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
+BR
+log_selector = LOG_SELECTOR
+
 qualify_domain = test.ex
 trusted_users = CALLER
 
@@ -62,12 +62,12 @@ mail:
          senders = ok@test3
   accept senders = ok@test1 : ok@test3
          verify  = sender
-         logwrite = :main,reject: mail accepted
+         logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argument"
 
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains
-         logwrite = :panic: rcpt accepted
+         logwrite = :panic: rcpt accepted C=$smtp_command_history
 
 # ----- Routers -----
 
@@ -84,7 +84,7 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
 
 # End