git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: harden versus badly-formatted AMS line
[users/jgh/exim.git]
/
test
/
confs
/
4002
diff --git
a/test/confs/4002
b/test/confs/4002
index a4e7cad7cdd3ede5240920cc6b075dcadea3feb3..043a1eccb8fb72816f6e46afcc2595e61e2fa42c 100644
(file)
--- a/
test/confs/4002
+++ b/
test/confs/4002
@@
-1,18
+1,17
@@
# Exim test configuration 4002
# Exim test configuration 4002
-# Content-scan: aveserver interface
+# Content-scan: spamassassin interface
+
+OPT= 127.0.0.1 7833
+
+.include DIR/aux-var/std_conf_prefix
-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
log_selector = +subject
log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER
-av_scanner = aveserver : DIR/eximdir/aveserver_sock
+spamd_address = OPT
# ----- Main settings -----
# ----- Main settings -----
@@
-22,8
+21,11
@@
acl_smtp_data = c_data
begin acl
c_data:
begin acl
c_data:
- accept !malware = * OPT
- deny logwrite = malware_name $malware_name
+ warn
+ spam = nobody
+ warn
+ log_message = $callout_address $spam_action $spam_report
+ accept
# ----- Routers -----
# ----- Routers -----