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

[exim.git] / test / confs / 4000

diff --git a/test/confs/4000 b/test/confs/4000
index 822f15f78b900e216ae768d93426feee279faede..d80aaa8f1febcc436cb958ae445b05745b2d3539 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,13 +1,9 @@
 # Exim test configuration 4000
 
 # Exim test configuration 4000
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+

 log_selector = +subject
 log_selector = +subject

+primary_hostname = myhost.test.ex

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


@@ -21,6 +17,10 @@ acl_smtp_mime = check_mime
 begin acl
 
 check_mime:
 begin acl
 
 check_mime:

+.ifdef BAD
+  deny    message =    this is a deny from the mime acl
+.endif
+

   warn     decode  = default
            add_header = X-$mime_part_count-content-type: $mime_content_type\n\
                         X-$mime_part_count-filename: $mime_filename\n\
   warn     decode  = default
            add_header = X-$mime_part_count-content-type: $mime_content_type\n\
                         X-$mime_part_count-filename: $mime_filename\n\


@@ -52,7 +52,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