Lookups: dsearch subdir with leading "..". Bug 2994

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index 2d53eff1a227889bc68a9d7bfd541050d3b55480..80c0211a936743bd1e85005703aa6a5f8c07b365 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -32,7 +32,9 @@ 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
 acl_smtp_data = check_data
 trusted_users = CALLER
 queue_only


@@ -55,6 +57,10 @@ ALLOW
 begin acl
 
 check_recipient:
 begin acl
 
 check_recipient:

+.ifdef RETRY2
+  drop  condition = ${if eq {SERVER}{server}}
+        message = 550 we really do not like you
+.endif

   accept hosts = :
   accept domains = +local_domains
   deny   message = relay not permitted
   accept hosts = :
   accept domains = +local_domains
   deny   message = relay not permitted


@@ -106,7 +112,11 @@ local_delivery:
 
 remote_smtp:
   driver = smtp
 
 remote_smtp:
   driver = smtp

+.ifdef RETRY2
+  hosts =      127.0.0.1 : HOSTIPV4
+.else

   hosts =      127.0.0.1
   hosts =      127.0.0.1

+.endif

   port =       PORT_S
   hosts_try_fastopen = :
 .ifdef _HAVE_TLS
   port =       PORT_S
   hosts_try_fastopen = :
 .ifdef _HAVE_TLS