Callouts: fix recipient verify/random

[exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index 5ff787e283bb1eaf1b0d7845e5c6e716fccd6720..ae5a309b972e3ba0a57d1c184226ff1eaa8d52c6 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,15 +2,11 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

+LOG_SELECTOR=
+
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -26,6 +22,7 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
 acl_smtp_rcpt = rcpt
 
 BR

+log_selector = LOG_SELECTOR

 
 qualify_domain = test.ex
 trusted_users = CALLER
 
 qualify_domain = test.ex
 trusted_users = CALLER


@@ -65,7 +62,7 @@ mail:
          senders = ok@test3
   accept senders = ok@test1 : ok@test3
          verify  = sender
          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
 
 rcpt:
   accept senders = +ok_senders