summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2015-02-02 00:11:05 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-02-09 16:00:55 +0000
commit8a512ed5b7f75c8aaedbca887257ee01e5c2b621 (patch)
tree9452b32006fc54c2858b50b83ef2ee3bc1a002c7 /test/confs
parent4c01d6abf6429fff8ca8a97027dc9ac965f477a3 (diff)
Add retry option to clamd and spamd. Bug 392
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/40056
-rw-r--r--test/confs/40094
2 files changed, 8 insertions, 2 deletions
diff --git a/test/confs/4005 b/test/confs/4005
index 8ed28d4a6..fd15dfc04 100644
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,6 +1,9 @@
# Exim test configuration 4005
# Content-scan: clamav interface
+OPT=
+CONTROL=
+
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
@@ -10,7 +13,8 @@ gecos_pattern = ""
gecos_name = CALLER_NAME
log_selector = +subject
-av_scanner = clamd : DIR/eximdir/clam_sock
+#XXX we need an additional test for tcp-connected clamd
+av_scanner = clamd : DIR/eximdir/clam_sock CONTROL
# ----- Main settings -----
diff --git a/test/confs/4009 b/test/confs/4009
index b635195b6..573aa6a4a 100644
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,6 +1,8 @@
# Exim test configuration 4009
# Content-scan: spamassassin interface
+OPT=
+
exim_path = EXIM_PATH
host_lookup_order = bydns
primary_hostname = myhost.test.ex
@@ -10,7 +12,7 @@ gecos_pattern = ""
gecos_name = CALLER_NAME
log_selector = +subject
-spamd_address = 127.0.0.1 7833
+spamd_address = 127.0.0.1 7833 OPT
# ----- Main settings -----