Retry: always use interface, if set, for retry DB key. Bug 1678

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

diff --git a/test/confs/0568 b/test/confs/0568
index dec5b0dbc67c647b9c0d77bf974444c00448e745..d5a8049c1d2d12595d8688548c2a6c5023624ef7 100644 (file)
--- a/test/confs/0568
+++ b/test/confs/0568
@@ -1,5 +1,4 @@
-# Exim test configuration 0568
-# Recipient callout with AUTH
+# Exim test configuration 0568:  ACL regex=
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
@@ -10,34 +9,33 @@ log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
+
 # ----- Main settings -----
 
 acl_smtp_rcpt = check_rcpt
+acl_smtp_data = check_data
+acl_not_smtp  = check_data
+acl_smtp_mime = check_mime
 
-queue_only
 
+# ----- ACL -----
 
-# ----- Authentication -----
+begin acl
 
-begin authenticators
+check_rcpt:
+  accept
 
-plain:
-  driver = plaintext
-  public_name = PLAIN
-  client_send = ^userx^secret
-  server_advertise_condition = yes
-  server_prompts =             :
-  server_condition =           yes
-  server_set_id =              $auth2
+check_data:
+  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
+           message = X-Regex: Regex matched <$regex1> <$regex3>
 
+  warn     condition = ${if !eq{$h_fakereject:}{}}
+           control   = fakereject
 
-# ----- ACLs -----
-
-begin acl
-
-check_rcpt:
-  accept  verify = recipient/callout
+  warn     condition = ${if !eq{$h_fakedefer:}{}}
+           control   = fakedefer
 
+  accept
 
 # ----- Routers -----
 
@@ -45,26 +43,16 @@ begin routers
 
 r1:
   driver = accept
-  transport = ${if eq{force}{$domain} {t2}{t1}}
-
+  transport = t1
 
 # ----- Transports -----
 
 begin transports
 
 t1:
-  driver = smtp
-  hosts = 127.0.0.1
-  port = PORT_S
-  allow_localhost
-  hosts_try_auth = *
-
-t2:
-  driver = smtp
-  hosts = 127.0.0.1
-  port = PORT_S
-  allow_localhost
-  hosts_try_auth = *
-  authenticated_sender= brian
+  driver = appendfile
+  file = DIR/test-mail/$local_part
+  user = CALLER
+
 
 # End