diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-01 14:05:43 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-01 15:10:32 +0000 |
| commit | b273058b341903372bdebe67d2960e4f8d2d8689 (patch) | |
| tree | 1140121e22e294bc5b118ab0fd76df6c6c0dcbb1 /test/confs/4002 | |
| parent | 84a655513611641b55a8f46c13ee0e3cb141477f (diff) | |
Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537
Diffstat (limited to 'test/confs/4002')
| -rw-r--r-- | test/confs/4002 | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/test/confs/4002 b/test/confs/4002 index 043a1eccb..cf124eccf 100644 --- a/test/confs/4002 +++ b/test/confs/4002 @@ -1,38 +1,53 @@ -# Exim test configuration 4002 -# Content-scan: spamassassin interface - -OPT= 127.0.0.1 7833 +# Exim test configuration 4001: ACL regex= .include DIR/aux-var/std_conf_prefix -log_selector = +subject primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s -# we need to set the sender -trusted_users = CALLER - -spamd_address = OPT # ----- Main settings ----- -acl_smtp_rcpt = accept -acl_smtp_data = c_data +acl_smtp_rcpt = check_rcpt +acl_smtp_data = check_data +acl_not_smtp = check_data + + +# ----- ACL ----- begin acl -c_data: - warn - spam = nobody - warn - log_message = $callout_address $spam_action $spam_report +check_rcpt: + accept + +check_data: + warn regex = \N(THIS\s((\w+)\s)?REGEX)\N + message = X-Regex: Regex matched <$regex1> <$regex3> + + warn condition = ${if !eq{$h_fakereject:}{}} + control = fakereject + + warn condition = ${if !eq{$h_fakedefer:}{}} + control = fakedefer + accept # ----- Routers ----- begin routers -r: - driver = redirect - data = :blackhole: +r1: + driver = accept + transport = t1 + +# ----- Transports ----- + +begin transports + +t1: + driver = appendfile + file = DIR/test-mail/${bless:$local_part} + user = CALLER + # End |