MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

diff --git a/test/confs/0256 b/test/confs/0256
index 99faa1d766f2571c929be91f014dd56d4231e77f..e48c69648c01f087d303e40c2eef189718de9751 100644 (file)
--- a/test/confs/0256
+++ b/test/confs/0256
@@ -1,19 +1,15 @@
 # Exim test configuration 0256
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
 acl_smtp_rcpt = accept
 qualify_domain = test.ex
-errors_copy = *@* ${quote_local_part::abcd+$domain+$local_part}@test.ex
+errors_copy = *@* ${quote_local_part::abcd+$domain+\
+  ${if eq{$local_part}{CALLER}{xxxx}{$local_part}}}@test.ex
 trusted_users = CALLER
 
 
@@ -34,7 +30,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
 
 # End