LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 4162

diff --git a/test/confs/4162 b/test/confs/4162
index 76045b7ca83be39d65965a5a8600ed9d90ea2175..9446f332909c417cf400f66ed103db5787d62f34 100644 (file)
--- a/test/confs/4162
+++ b/test/confs/4162
@@ -1,15 +1,17 @@
 # Exim test configuration 4162
 
 # Exim test configuration 4162
 

-ALLOW=allow_filter
-FORBID=
-

 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 

+

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

-log_selector = +queue_time_overall
+qualify_domain = test.ex
+
+acl_smtp_rcpt = accept
+log_selector = +address_rewrite
+

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 


@@ -17,16 +19,31 @@ begin routers
 
 r1:
   driver = redirect
 
 r1:
   driver = redirect

-  user = EXIMUSER
-  ALLOW
-  FORBID
-  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
+  allow_filter
+  file = DIR/aux-fixed/TESTNUM.filter
+  redirect_router = r2
+  user = CALLER
+
+r2:
+  driver = accept
+  transport = t1
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = /dev/null
+  user = CALLER
+

 
 

+# ----- Rewrite -----

 
 

-# ----- Retry -----
+begin rewrite

 
 

-begin retry
+*@cam   $local_part@cam.ac.uk

 
 

-* *    F,1d,1h

 
 # End
 
 # End