summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen Hansen <steffen@kdab.com>2005-06-10 23:54:37 (GMT)
committerSteffen Hansen <steffen@kdab.com>2005-06-10 23:54:37 (GMT)
commitbb57fd5ab037f758c42208b9a298a71c8049241f (patch)
tree6c1f6b0a9c5e3ae9f58122648ccad54f1745489a
parentb5df08caaf8f0a21c30737473c6c92c9253ab73e (diff)
downloadkolab-conf-bb57fd5ab037f758c42208b9a298a71c8049241f.tar.gz
rewite from header (Issue783)
-rw-r--r--conf/templates/main.cf.template4
-rw-r--r--conf/templates/master.cf.template2
-rw-r--r--conf/templates/resmgr.conf.template4
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/templates/main.cf.template b/conf/templates/main.cf.template
index ea3351a..268b724 100644
--- a/conf/templates/main.cf.template
+++ b/conf/templates/main.cf.template
@@ -53,8 +53,8 @@ relocated_maps = hash:@l_prefix@/etc/postfix/relocated
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 = +
diff --git a/conf/templates/master.cf.template b/conf/templates/master.cf.template
index e8109b3..97dbedd 100644
--- a/conf/templates/master.cf.template
+++ b/conf/templates/master.cf.template
@@ -24,7 +24,7 @@ smtp unix - - n - - smtp
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)
diff --git a/conf/templates/resmgr.conf.template b/conf/templates/resmgr.conf.template
index a02de64..17e74fb 100644
--- a/conf/templates/resmgr.conf.template
+++ b/conf/templates/resmgr.conf.template
@@ -24,6 +24,10 @@ $params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE')
// 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;