DNS: tag res_search() hack by lookup type in debug output; munge ipv6 lines in testsuite

[users/jgh/exim.git] / test / confs / 2024

diff --git a/test/confs/2024 b/test/confs/2024
index 9d10d006da83b2847ee52e349468b1bf5d44179f..ea3b2820653801fcbf2578074626b3cadcca9868 100644 (file)
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -3,14 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_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 -----
 
@@ -27,4 +22,6 @@ tls_verify_hosts = HOSTIPV4
 #tls_verify_certificates = TVC
 tls_verify_certificates = CERT
 
+# so we can decode in wireshark
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 # End