bernhard: server/kolabd/kolabd/templates main.cf.template, 1.15.2.5, 1.15.2.6

[cvs at kolab.org]

Author: bernhard

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

Modified Files:
      Tag: kolab_2_0_branch
	main.cf.template 
Log Message:
Made email masquerading more predictable which might prevent loss
of email when addressed to some at machine.example.org.


Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/Attic/main.cf.template,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -d -r1.15.2.5 -r1.15.2.6
--- main.cf.template	11 Jan 2006 14:23:57 -0000	1.15.2.5
+++ main.cf.template	28 Aug 2006 11:03:02 -0000	1.15.2.6
@@ -32,7 +32,10 @@
 
 # 
 masquerade_domains = $mydomain
-masquerade_exceptions = root
+#       Kolab Server does _not_ want to forward to local machines by default,
+#       so we can add "envelope_recipient" to masquerade_classes:
+masquerade_classes = envelope_sender, envelope_recipient,
+                     header_sender, header_recipient
 
 #   smtp daemon
 #smtpd_banner = $myhostname ESMTP $mail_name