bug-fix test-driving input

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 4c5824545c4b826c0c06becbeaea3031d3527fd6..e02380f73694e637ca9116012bc5589742c3a6f5 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,7 +1,7 @@
 # Exim test configuration 0900
 SERVER=
 # Exim test configuration 0900
 SERVER=

-Y=
-OPT=
+SRV=
+LIST=

 ALLOW=
 
 exim_path = EXIM_PATH
 ALLOW=
 
 exim_path = EXIM_PATH


@@ -12,7 +12,7 @@ log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *

-tls_advertise_hosts = ${if eq {Y}{tls} {*}}
+tls_advertise_hosts = ${if eq {SRV}{tls} {*}}

 
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----


@@ -28,8 +28,10 @@ queue_only
 smtp_receive_timeout = 2s
 log_selector = +received_recipients
 
 smtp_receive_timeout = 2s
 log_selector = +received_recipients
 

+.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}
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}

+.endif

 
 ALLOW
 
 
 ALLOW
 


@@ -50,7 +52,6 @@ check_data:
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 
   warn   message = X-acl-message-linecount: $message_linecount
   accept
 

-

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -58,7 +59,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}

-  transport =  remote_smtp${if eq {X}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}

   errors_to =  ""
 
 fail_remote_domains:
   errors_to =  ""
 
 fail_remote_domains:


@@ -103,12 +104,12 @@ remote_smtp_dkim:
   command_timeout = 2s
   final_timeout = 2s
 
   command_timeout = 2s
   final_timeout = 2s
 

-.ifdef X
+.ifdef OPT

   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE

-  dkim_sign_headers =  OPT
+  dkim_sign_headers =  LIST

 .endif
 .endif
 
 .endif
 .endif