DANE: fix TA-mode verify under GnuTLS. Bug 2311

[exim.git] / test / confs / 0021

diff --git a/test/confs/0021 b/test/confs/0021
index c48c0e08e9680f641488e4e98066f343f3568f2d..cb057386eaed0306ec8a0f1f553c91cc88e313a6 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,16 +2,11 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

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

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

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

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


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


@@ -71,7 +67,7 @@ mail:
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains
 rcpt:
   accept senders = +ok_senders
          sender_domains = +ok_sender_domains

-         logwrite = :panic: rcpt accepted
+         logwrite = :panic: rcpt accepted C=$smtp_command_history

 
 # ----- Routers -----
 
 
 # ----- Routers -----