Reduce space used by flags in smtp transport

[users/heiko/exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index 902d5f36961bc4e28593bcd3634212a96b368164..6205eae631b3cc51338f53b7ffd58b4844c0751d 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -1,15 +1,11 @@
 # Exim test configuration 0021
 
 SERVER=
+BR=
+
+.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 +20,8 @@ acl_smtp_helo = helo
 acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
+BR
+
 qualify_domain = test.ex
 trusted_users = CALLER
 
@@ -62,7 +60,7 @@ 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