summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2009-04-07 13:27:42 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2009-04-07 13:27:42 (GMT)
commit7d5fdabe95347501e5cd6dd850965c12b09eb529 (patch)
tree2b927a7b9f23033c2e26d48ff6947156eac5eef6
parentacd34759d9f4363593c507cea956a663be5b35c1 (diff)
downloadserver-7d5fdabe95347501e5cd6dd850965c12b09eb529.tar.gz
kolabd: Disable quarantine of mails with bad headers in amavisd template
since they are passed through by default.
-rw-r--r--kolabd/kolabd/ChangeLog5
-rw-r--r--kolabd/kolabd/templates/amavisd.conf.template.in1
-rw-r--r--release-notes.txt5
3 files changed, 10 insertions, 1 deletions
diff --git a/kolabd/kolabd/ChangeLog b/kolabd/kolabd/ChangeLog
index b81b3b6..f750c3f 100644
--- a/kolabd/kolabd/ChangeLog
+++ b/kolabd/kolabd/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-07 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * templates/amavisd.conf.template.in: Disable
+ $bad_header_quarantine_method since D_PASS is default policy.
+
2009-04-06 Thomas Arendsen Hein <thomas@intevation.de>
* templates/clamd.conf.template.in,
diff --git a/kolabd/kolabd/templates/amavisd.conf.template.in b/kolabd/kolabd/templates/amavisd.conf.template.in
index fe1b9d9..6785573 100644
--- a/kolabd/kolabd/templates/amavisd.conf.template.in
+++ b/kolabd/kolabd/templates/amavisd.conf.template.in
@@ -535,6 +535,7 @@ $QUARANTINEDIR = '@amavisd_home@/virusmails';
#$virus_quarantine_method = "local:virus-%i-%n"; # default
#$spam_quarantine_method = "local:spam-%b-%i-%n"; # default
+$bad_header_quarantine_method = undef; # default: 'local:badh-%m';
#
#use the new 'bsmtp:' method as an alternative to the default 'local:'
#$virus_quarantine_method = "bsmtp:$QUARANTINEDIR/virus-%i-%n.bsmtp";
diff --git a/release-notes.txt b/release-notes.txt
index 692d9f6..c7a316b 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -58,7 +58,10 @@ Changes between 2.2.1-rc-1 and 2.2.1:
kolab/issue3130 (Perl Error on Upgrade)
- - kolabd-2.2.1-20090406
+ - kolabd-2.2.1-20090407
+
+ Disable quarantine of mails with bad headers in amavisd template
+ since they are passed through by default.
kolab/issue3096 (Address book aliases shouldn't redirect outgoing
mails)