Fix DKIM verify operation in -bh test mode. Bug 2017

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

diff --git a/test/confs/4503 b/test/confs/4503
index ddd87d0fac84ec7a26d4fafe833056be5523331a..cbd82d8f5ba56c086990651bb85663a17172e526 100644 (file)
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -1,21 +1,17 @@
 # Exim test configuration 4503
 
 SERVER=
 # Exim test configuration 4503
 
 SERVER=

+OPT=
+
+.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

-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 -----
 

-log_selector = +outgoing_port

 acl_smtp_rcpt = accept
 acl_smtp_rcpt = accept

-acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length
+acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+

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


@@ -41,8 +37,14 @@ send_to_server:
   port = PORT_D
 
   dkim_domain =                test.ex
   port = PORT_D
 
   dkim_domain =                test.ex

+.ifdef SELECTOR
+  dkim_selector =      SELECTOR
+.else

   dkim_selector =      sel
   dkim_selector =      sel

+.endif

   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private

-  dkim_sign_headers =  From
+.ifndef HEADERS_MAXSIZE
+  dkim_sign_headers =  OPT
+.endif

 
 # End
 
 # End