summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-12-28 17:16:54 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-01-12 18:58:37 +0000
commit0f0c8159c43045f4ad847a0129dca7eddd313285 (patch)
treee1c4dd3263a083def7f0828a59c7fffb403752fd /test/confs
parent4e71661f10e9df59f0e7c31cc708f4fcc0c49089 (diff)
Support timeout option on malware=
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/40012
-rw-r--r--test/confs/40023
-rw-r--r--test/confs/40033
-rw-r--r--test/confs/40043
-rw-r--r--test/confs/40055
-rw-r--r--test/confs/40065
-rw-r--r--test/confs/40073
7 files changed, 15 insertions, 9 deletions
diff --git a/test/confs/4001 b/test/confs/4001
index 39e770545..00406b4ee 100644
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -19,7 +19,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * OPT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4002 b/test/confs/4002
index 5ebb937a6..cc0d05ebb 100644
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = aveserver : DIR/eximdir/aveserver_sock
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * OPT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4003 b/test/confs/4003
index e2d65baa1..7fbd61ba0 100644
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = fsecure : DIR/eximdir/fsec_sock
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = <; * OPT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4004 b/test/confs/4004
index 22cbbd0f4..84471acac 100644
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = sophie : DIR/eximdir/sophie_sock
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * OPT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4005 b/test/confs/4005
index 6d0b797b9..8ed28d4a6 100644
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,4 +1,4 @@
-# Exim test configuration 4002
+# Exim test configuration 4005
# Content-scan: clamav interface
exim_path = EXIM_PATH
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = clamd : DIR/eximdir/clam_sock
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * OPT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4006 b/test/confs/4006
index 230f1159e..8ac65a584 100644
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,4 +1,4 @@
-# Exim test configuration 4002
+# Exim test configuration 4006
# Content-scan: avast interface
exim_path = EXIM_PATH
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = avast : DIR/eximdir/avast_sock : OPTION
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * INSERT
deny logwrite = malware_name $malware_name
# ----- Routers -----
diff --git a/test/confs/4007 b/test/confs/4007
index 576c0087f..110a590f0 100644
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -8,6 +8,7 @@ spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+log_selector = +subject
av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
begin acl
c_data:
- accept !malware = *
+ accept !malware = * INSERT
deny logwrite = malware_name $malware_name
# ----- Routers -----