steffen: server/kolabd/kolabd/templates main.cf.template, 1.14, 1.15 master.cf.template, 1.10, 1.11 resmgr.conf.template, 1.5, 1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	main.cf.template master.cf.template resmgr.conf.template 
Log Message:
rewite from header (Issue783)

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- main.cf.template	10 Jun 2005 14:17:05 -0000	1.14
+++ main.cf.template	10 Jun 2005 23:54:37 -0000	1.15
@@ -53,8 +53,8 @@
 transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport
 alias_maps = hash:@l_prefix@/etc/postfix/aliases
 alias_database = hash:@l_prefix@/etc/postfix/aliases
-virtual_mailbox_maps = $virtual_maps
-local_recipient_maps = $virtual_mailbox_maps
+#virtual_mailbox_maps = $virtual_maps
+local_recipient_maps = $virtual_maps
 
 #   local delivery
 recipient_delimiter = +

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- master.cf.template	10 Jun 2005 12:25:23 -0000	1.10
+++ master.cf.template	10 Jun 2005 23:54:37 -0000	1.11
@@ -24,7 +24,7 @@
 showq     unix  n       -       n       -       -       showq
 error     unix  -       -       n       -       -       error
 local     unix  -       n       n       -       -       local
-virtual   unix  -       n       n       -       -       virtual
+#virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
 #cyrus    unix  -       n       n       -       -       pipe flags=R user=cyrus argv=/kolab/bin/deliver -e -m ${extension} ${user}
 #uucp     unix  -       n       n       -       -       pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)

Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resmgr.conf.template	6 Jun 2005 23:46:16 -0000	1.5
+++ resmgr.conf.template	10 Jun 2005 23:54:37 -0000	1.6
@@ -24,6 +24,10 @@
 // Should the Sender: header be used over From: if present?
 $params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
 
+// Should reject messages with From headers that dont match
+// the envelope? Default is to rewrite the header
+$params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart
 $params['allow_outlook_ical_forward']  = true;