thomas: server/kolabd/kolabd/templates main.cf.template.in, 1.22, 1.22.2.1 master.cf.template.in, 1.25, 1.25.2.1

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv17282/kolabd/kolabd/templates

Modified Files:
      Tag: kolab_2_2_branch
	main.cf.template.in master.cf.template.in 
Log Message:
Fix kolab/issue3549 (append_dot_mydomain allows circumventing kolabfilter-verify-from-header)


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- main.cf.template.in	30 Jan 2009 12:00:49 -0000	1.22
+++ main.cf.template.in	14 May 2009 10:52:36 -0000	1.22.2.1
@@ -55,6 +55,10 @@
 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@@@

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- master.cf.template.in	8 Nov 2008 11:59:28 -0000	1.25
+++ master.cf.template.in	14 May 2009 10:52:36 -0000	1.25.2.1
@@ -48,7 +48,7 @@
 #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