X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/e7dadabd81968d7994e9bc36aa67b6bd3de63abe..c85476e9d9f9002927fc3e2a6a12005423359ff1:/test/confs/0900

diff --git a/test/confs/0900 b/test/confs/0900
index 7a1296c7e..9a856899a 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -26,10 +26,17 @@ acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
 log_selector = +received_recipients
+.endif
 
+.ifdef _OPT_MAIN_TLS_CERTIFICATE
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+.endif
 
 ALLOW
 
@@ -50,7 +57,6 @@ check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
-
 # ----- Routers -----
 
 begin routers
@@ -94,7 +100,6 @@ remote_smtp:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
-  headers_rewrite = *@* CALLER_NAME@$domain fs
 
 remote_smtp_dkim:
   driver = smtp
@@ -103,7 +108,6 @@ remote_smtp_dkim:
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
-  headers_rewrite = *@* CALLER_NAME@$domain fs
 
 .ifdef OPT
   dkim_domain =		test.ex