git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MySQL, pgsql: per-query server options outside the lookup string. Bug 2546
[users/heiko/exim.git]
/
test
/
confs
/
4000
diff --git
a/test/confs/4000
b/test/confs/4000
index bc4ccd8fd0dd9c4834aa870ddf6229edb0b5cb55..d80aaa8f1febcc436cb958ae445b05745b2d3539 100644
(file)
--- a/
test/confs/4000
+++ b/
test/confs/4000
@@
-1,15
+1,9
@@
# Exim test configuration 4000
# Exim test configuration 4000
-exim_path = EXIM_PATH
-keep_environment =
-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
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
# ----- Main settings -----
# ----- Main settings -----
@@
-23,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\
@@
-54,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