GnuTLS: simplify cert hostname checking

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

diff --git a/test/confs/0574 b/test/confs/0574
index 289ed1955a1663d2f88e62df8824dc45725e028b..9afc55247a072e7171bd994da5be874cc710ee12 100644 (file)
--- a/test/confs/0574
+++ b/test/confs/0574
@@ -1,46 +1,28 @@
 # Exim test configuration 0574
 
 # Exim test configuration 0574
 

-SERVER =
+.include DIR/aux-var/std_conf_prefix

 
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 

-log_selector = +received_recipients +sender_on_delivery
+# ----- Main settings -----
+
+acl_smtp_mail = chk_mail
+acl_smtp_rcpt = chk_rcpt
+acl_smtp_data = chk_data

 
 

-acl_smtp_rcpt = rcpt

 queue_only
 queue_only

-queue_run_in_order

 
 

-#---------------
+# ----- ACL -----

 
 begin acl
 
 
 begin acl
 

-rcpt:
-  accept
-    queue = ${if eq {normal}{$local_part} {} {$local_part}}
-    logwrite = using queue '$queue_name'
-
-#---------------
-
-begin routers
+chk_mail:
+  accept control = debug/tag=_1

 
 

-all:
-  driver = accept
-  transport = dump
+chk_rcpt:
+  accept control = debug/kill

 
 

-#---------------
-
-begin transports
-
-dump:
-  driver = pipe
-  command = true
+chk_data:
+  accept control = debug/tag=_2/opts=+all

 
 # End
 
 # End

-