Merge remote-tracking branch 'github/pr/50'

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

diff --git a/test/confs/4503 b/test/confs/4503
index 45e6d146379a900440e91ffa1c5fe19d29fb33df..cbd82d8f5ba56c086990651bb85663a17172e526 100644 (file)
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -3,15 +3,9 @@
 SERVER=
 OPT=
 
 SERVER=
 OPT=
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -43,7 +37,11 @@ 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
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =  OPT
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE
   dkim_sign_headers =  OPT