Testsuite: fix macro conflict (X vs. HEADERS_MAXSIZE)

[users/heiko/exim.git] / test / confs / 5650

diff --git a/test/confs/5650 b/test/confs/5650
index 12584c731896965beb0642f2ff2339014ee62add..ee1ae3c50c6e32e63ba9f4f2ade97e584d6b96e7 100644 (file)
--- a/test/confs/5650
+++ b/test/confs/5650
@@ -3,17 +3,14 @@
 
 CRL=
 
 
 CRL=
 

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

 primary_hostname = server1.example.com
 primary_hostname = server1.example.com

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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

+acl_smtp_connect = check_connect
+acl_smtp_mail = check_mail

 acl_smtp_rcpt = check_recipient
 
 log_selector = +tls_peerdn
 acl_smtp_rcpt = check_recipient
 
 log_selector = +tls_peerdn


@@ -38,6 +35,16 @@ tls_ocsp_file = OCSP
 
 begin acl
 
 
 begin acl
 

+check_connect:
+  accept   logwrite = acl_conn: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})
+
+check_mail:
+  accept   logwrite = acl_mail: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})
+

 check_recipient:
   accept
 
 check_recipient:
   accept