summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-04-26 16:22:23 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-04-26 16:22:23 (GMT)
commit77f50fdd1cefc56da49ecc8ab1a8c853d78bbe6f (patch)
tree53d1a4e95a345f948edc2ab80e466b2600da83b9
parentd3806cf35ecb6a3ee40cb65648174d1783c280d8 (diff)
downloadkolab-conf-77f50fdd1cefc56da49ecc8ab1a8c853d78bbe6f.tar.gz
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.
-rw-r--r--conf/templates/resmgr.conf.template.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 81664ff..e2e799d 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -33,6 +33,10 @@ $params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE')
$params['verify_from_header'] = false;
@@@endif@@@
+// Should we perform this check on mail from our
+// subdomains too?
+$params['verify_subdomains'] = false;
+
// Should the Sender: header be used over From: if present?
@@@if kolabfilter-allow-sender-header@@@
$params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
@@ -48,14 +52,14 @@ $params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-heade
$params['reject_forged_from_header'] = false;
@@@endif@@@
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
+$params['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+
// Should we allow forwarded ical messages from Outlook
// by encapsulating them in a MIME multipart
$params['allow_outlook_ical_forward'] = true;
-// Should we perform this check on mail from our
-// subdomains too?
-$params['verify_subdomains'] = true;
-
// LDAP data
// What is the address of the LDAP server address where user objects reside
$params['ldap_uri'] = '@@@ldap_uri@@@';