X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/2c47372fad0f829ddfa29d04095f57a70206469c..4e48d56c083d2f763a5978e1dbf515b12dc12f96:/test/confs/0900

diff --git a/test/confs/0900 b/test/confs/0900
index 9a856899a..ce6f2c379 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,6 +13,15 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
+.ifdef _HAVE_REQTLS
+tls_advertise_requiretls = :
+.endif
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts = :
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 
 # ----- Main settings -----
@@ -64,7 +73,7 @@ begin routers
 to_server:
   driver = accept
   condition =	${if !eq {SERVER}{server}}
-  transport =	remote_smtp${if eq {OPT}{dkim} {_dkim}}
+  transport =	remote_smtp${if eq {SRV}{dkim} {_dkim}}
   errors_to =	""
 
 fail_remote_domains:
@@ -109,7 +118,8 @@ remote_smtp_dkim:
   command_timeout = 2s
   final_timeout = 2s
 
-.ifdef OPT
+.ifdef _HAVE_DKIM
+.ifdef SRV
   dkim_domain =		test.ex
   dkim_selector =	sel
   dkim_private_key =	DIR/aux-fixed/dkim/dkim.private
@@ -117,6 +127,7 @@ remote_smtp_dkim:
   dkim_sign_headers =	LIST
 .endif
 .endif
+.endif
 
 # ----- Retry -----