Merge branch '4.next'

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

diff --git a/test/confs/0268 b/test/confs/0268
index 6be4e662f31b928efce74aff533df1326e3a5075..15a4ae24cfdeb534a8e0092cae8260f211ddf2af 100644 (file)
--- a/test/confs/0268
+++ b/test/confs/0268
@@ -1,13 +1,8 @@
 # Exim test configuration 0268
 
 # Exim test configuration 0268
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -83,19 +78,19 @@ r9:
   domains = r9
   allow_fail
   file = DIR/test-owned-by-exim
   domains = r9
   allow_fail
   file = DIR/test-owned-by-exim

-  owngroups = CALLER : EXIMGROUP
+  owngroups = CALLERGROUP : EXIMGROUP

 
 r10:
   driver = redirect
   domains = r10
   file = DIR/test-owned-by-exim
 
 r10:
   driver = redirect
   domains = r10
   file = DIR/test-owned-by-exim

-  owngroups = CALLER
+  owngroups = CALLERGROUP

 
 r11:
   driver = redirect
   domains = r11
   file = DIR/test-owned-by-exim
 
 r11:
   driver = redirect
   domains = r11
   file = DIR/test-owned-by-exim

-  owngroups = CALLER : EXIMGROUP
+  owngroups = CALLERGROUP : EXIMGROUP

   modemask = 007
 
 # End
   modemask = 007
 
 # End