summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2009-05-14 10:52:36 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2009-05-14 10:52:36 (GMT)
commit61121f15265e1cb77e509ef270b1f777ac2719a7 (patch)
tree44ad1b34c04a4ea4bf9948b15534ee5d7f86f352
parenta8145dd9e8d45fa73c344f32e5ae979b50d4c5fb (diff)
downloadkolab-conf-61121f15265e1cb77e509ef270b1f777ac2719a7.tar.gz
Fix kolab/issue3549 (append_dot_mydomain allows circumventing kolabfilter-verify-from-header)
-rw-r--r--conf/templates/main.cf.template.in4
-rw-r--r--conf/templates/master.cf.template.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/templates/main.cf.template.in b/conf/templates/main.cf.template.in
index 8fa46ec..b971817 100644
--- a/conf/templates/main.cf.template.in
+++ b/conf/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/conf/templates/master.cf.template.in b/conf/templates/master.cf.template.in
index ccff4d5..bfbdcea 100644
--- a/conf/templates/master.cf.template.in
+++ b/conf/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