Tidy log for panic-die

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index a56ec0e5cb0a5a1e5d4e995f4bf21418feb9e674..219751ec16d8ff2171a6f8eb01f8fc482cff65fd 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -13,9 +13,8 @@ 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 = *

+.ifdef _HAVE_TLS

 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 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_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :


@@ -33,19 +32,21 @@ primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = check_recipient

+.ifdef _HAVE_PRDR

 acl_smtp_data_prdr = check_prdr
 acl_smtp_data_prdr = check_prdr

+.endif

 acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM
 acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only
 smtp_receive_timeout = 2s
 
 .ifdef _HAVE_DKIM

-log_selector = +received_recipients +millisec +dkim_verbose
+log_selector = +received_recipients +connection_id +millisec +dkim_verbose

 .else
 .else

-log_selector = +received_recipients +millisec
+log_selector = +received_recipients +connection_id +millisec

 .endif
 
 .endif
 

-.ifdef _OPT_MAIN_TLS_CERTIFICATE
+.ifdef _HAVE_TLS

 tls_certificate = DIR/aux-fixed/cert1
 .endif
 
 tls_certificate = DIR/aux-fixed/cert1
 .endif
 


@@ -110,8 +111,10 @@ remote_smtp:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+.ifdef _HAVE_TLS

   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =

+.endif

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s


@@ -121,8 +124,10 @@ remote_smtp_dkim:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+.ifdef _HAVE_TLS

   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =
   tls_verify_certificates = DIR/aux-fixed/cert1
   tls_verify_cert_hostnames =

+.endif

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s