Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

[exim.git] / test / confs / 9001

diff --git a/test/confs/9001 b/test/confs/9001
index cd474796fdbab16f06105fd9237ae10fc25082dc..ba5a1687f6366f10a56d5b7df04d048c7f24af39 100644 (file)
--- a/test/confs/9001
+++ b/test/confs/9001
@@ -1,14 +1,8 @@
 # Exim test configuration 9001
 
 # Exim test configuration 9001
 

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

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

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -24,7 +18,7 @@ r0:
 
 r1:
   driver = redirect
 
 r1:
   driver = redirect

-  data = ${lookup ldap user="cn=xxx,o=yyy,c=UK" pass="secret" \
+  data = ${lookup ldap {USER="cn=xxx,o=yyy,c=UK" PASS="secret" \

          ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}
 
 
          ldap:///o=zzz,c=UK,?sn?sub?(cn=foo)}}
 
 


@@ -34,7 +28,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 
   user = CALLER