Sync 4.next from master

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

diff --git a/test/confs/9300 b/test/confs/9300
index 8f413c0f24e243334fe21fa009fdf6d6084738f6..086b506c6a35e1f4f1cc11c908534a1dbaa9500b 100644 (file)
--- a/test/confs/9300
+++ b/test/confs/9300
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-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 -----
 


@@ -21,11 +16,11 @@ begin authenticators
 sasl1:
   driver = cyrus_sasl
   public_name = ANONYMOUS
 sasl1:
   driver = cyrus_sasl
   public_name = ANONYMOUS

-  server_set_id = $1
+  server_set_id = $auth1

 
 sasl2:
   driver = cyrus_sasl
   public_name = PLAIN
 
 sasl2:
   driver = cyrus_sasl
   public_name = PLAIN

-  server_set_id = $1
+  server_set_id = $auth1

 
 # End
 
 # End