Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / confs / 0376

diff --git a/test/confs/0376 b/test/confs/0376
index 04731c975f41bf6f41e069c75d9ff167e5680737..7679a649f9ebc2b650d058c35af66d8db5dfc4d6 100644 (file)
--- a/test/confs/0376
+++ b/test/confs/0376
@@ -2,15 +2,9 @@
 
 PEX=10s
 
 
 PEX=10s
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -42,6 +36,10 @@ check_recipient:
          !verify  = sender/callout=postmaster_mailfrom=pmsend@a.domain
   deny    hosts   = V4NET.0.0.9
          !verify  = sender/callout=fullpostmaster
          !verify  = sender/callout=postmaster_mailfrom=pmsend@a.domain
   deny    hosts   = V4NET.0.0.9
          !verify  = sender/callout=fullpostmaster

+  warn   !hosts   = V4NET.0.0.10
+         condition = ${if def:sender_verify_failure}
+         logwrite = ($sender_verify_failure)
+

   deny    hosts   = V4NET.0.0.10
          !verify  = recipient/callout=postmaster_mailfrom=pmsend@b.domain,\
                       use_postmaster,random/defer_ok
   deny    hosts   = V4NET.0.0.10
          !verify  = recipient/callout=postmaster_mailfrom=pmsend@b.domain,\
                       use_postmaster,random/defer_ok


@@ -72,6 +70,7 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  hosts_try_fastopen = :

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----