summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Wilde <wilde@intevation.de>2009-06-18 15:45:39 (GMT)
committerSascha Wilde <wilde@intevation.de>2009-06-18 15:45:39 (GMT)
commit3dfdd9bc073231081e33b1ff920342d20e292e32 (patch)
tree5a3f68b43089f0e045e84730405b24c6231295d1
parent8042408cb6918f2de2558388e6443f19372b3d1c (diff)
downloadserver-3dfdd9bc073231081e33b1ff920342d20e292e32.tar.gz
Merged changes from 2.2.2 release.
-rw-r--r--kolabd/kolabd/ChangeLog14
-rw-r--r--kolabd/kolabd/configure.ac2
-rw-r--r--kolabd/kolabd/templates/clamd.conf.template.in27
-rw-r--r--kolabd/kolabd/templates/main.cf.template.in4
-rw-r--r--kolabd/kolabd/templates/master.cf.template.in2
5 files changed, 41 insertions, 8 deletions
diff --git a/kolabd/kolabd/ChangeLog b/kolabd/kolabd/ChangeLog
index 45857e5..31806af 100644
--- a/kolabd/kolabd/ChangeLog
+++ b/kolabd/kolabd/ChangeLog
@@ -1,3 +1,17 @@
+2009-05-14 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * templates/main.cf.template.in, templates/master.cf.template.in:
+ Use append_dot_mydomain = no and remote_header_rewrite_domain =
+ domain.invalid and disable masquerade_domains for post-cleanup.
+ Fixes kolab/issue3549 (append_dot_mydomain allows circumventing
+ kolabfilter-verify-from-header)
+
+2009-05-13 Thomas Arendsen Hein <thomas@intevation.de>
+
+ * templates/clamd.conf.template.in:
+ Updated templates for clamav-0.95.1-20090409 for
+ kolab/issue3513 (Clamav - new upstream version 0.95.1)
+
2009-04-23 Gunnar Wrobel <p@rdus.de>
* templates/freebusy.conf.template.in: Configuration support for
diff --git a/kolabd/kolabd/configure.ac b/kolabd/kolabd/configure.ac
index 09fdec8..bef9298 100644
--- a/kolabd/kolabd/configure.ac
+++ b/kolabd/kolabd/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.59)
# not the real version
-m4_define(_VERSION,2.2.1)
+m4_define(_VERSION,2.2.2)
AC_INIT([kolabd],[_VERSION],[kolab-devel@kolab.org])
AC_CONFIG_AUX_DIR(.)
diff --git a/kolabd/kolabd/templates/clamd.conf.template.in b/kolabd/kolabd/templates/clamd.conf.template.in
index a530e65..1caae23 100644
--- a/kolabd/kolabd/templates/clamd.conf.template.in
+++ b/kolabd/kolabd/templates/clamd.conf.template.in
@@ -121,6 +121,26 @@ FixStaleSocket yes
# Default: 120
#ReadTimeout 300
+# This option specifies the time (in seconds) after which clamd should
+# timeout if a client doesn't provide any initial command after connecting.
+# Default: 5
+#CommandReadTimeout 5
+
+# This option specifies how long to wait (in miliseconds) if the send buffer is full.
+# Keep this value low to prevent clamd hanging
+#
+# Default: 500
+#SendBufTimeout 200
+
+# Maximum number of queued items (including those being processed by MaxThreads threads)
+# It is recommended to have this value at least twice MaxThreads if possible.
+# WARNING: you shouldn't increase this too much to avoid running out of file descriptors,
+# the following condition should hold:
+# MaxThreads*MaxRecursion + (MaxQueue - MaxThreads) + 6< RLIMIT_NOFILE (usual max is 1024)
+#
+# Default: 100
+#MaxQueue 200
+
# Waiting for a new job will timeout after this time (seconds).
# Default: 30
#IdleTimeout 60
@@ -144,7 +164,7 @@ FixStaleSocket yes
#FollowFileSymlinks yes
# Perform a database check.
-# Default: 1800 (30 min)
+# Default: 600 (10 min)
#SelfCheck 600
# Execute a command when virus is found. In the command string %v will
@@ -342,11 +362,6 @@ User @clamav_rusr@
# Default: yes
#ScanArchive yes
-# Use slower but memory efficient decompression algorithm.
-# only affects the bzip2 decompressor.
-# Default: no
-#ArchiveLimitMemoryUsage yes
-
# Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).
# Default: no
#ArchiveBlockEncrypted no
diff --git a/kolabd/kolabd/templates/main.cf.template.in b/kolabd/kolabd/templates/main.cf.template.in
index 8fa46ec..b971817 100644
--- a/kolabd/kolabd/templates/main.cf.template.in
+++ b/kolabd/kolabd/templates/main.cf.template.in
@@ -55,6 +55,10 @@ masquerade_domains = @@@postfix-mydestination|join( )@@@
masquerade_classes = envelope_sender, envelope_recipient,
header_sender, header_recipient
+# See kolab/issue3549 (append_dot_mydomain allows circumventing kolabfilter-verify-from-header)
+append_dot_mydomain = no
+remote_header_rewrite_domain = domain.invalid
+
# smtp daemon
#smtpd_banner = $myhostname ESMTP $mail_name
@@@if bind_any@@@
diff --git a/kolabd/kolabd/templates/master.cf.template.in b/kolabd/kolabd/templates/master.cf.template.in
index ccff4d5..bfbdcea 100644
--- a/kolabd/kolabd/templates/master.cf.template.in
+++ b/kolabd/kolabd/templates/master.cf.template.in
@@ -48,7 +48,7 @@ scache unix - - n - 1 scache
#ifmail unix - n n - - pipe flags=F user=ftn argv=@bindir@/ifmail -r $nexthop ($recipient)
#bsmtp unix - n n - - pipe flags=Fq. user=foo argv=@bindir@/bsmtp -f $sender $nexthop $recipient
@@@bind_addr@@@:465 inet n - n - - smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-post-cleanup unix n - n - 0 cleanup -o virtual_alias_maps=
+post-cleanup unix n - n - 0 cleanup -o virtual_alias_maps= -o masquerade_domains=
smtp-amavis unix - - n - 2 smtp
-o smtp_data_done_timeout=1200
-o smtp_send_xforward_command=yes