summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-04-15 14:45:38 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-04-15 14:45:38 (GMT)
commit604c8afdecbd21e75268b2f0a8755c327e4adcd8 (patch)
tree2d23e6f10c9e0c24e3cdbfb7aa1cf23e2bbd2afc
parent0708845988da7f780f7f9b7c7a4958f1a445de8a (diff)
downloadkolab-conf-604c8afdecbd21e75268b2f0a8755c327e4adcd8.tar.gz
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)
-rw-r--r--conf/templates/resmgr.conf.template.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 82f0ee3..96a9316 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -122,8 +122,7 @@ $conf['kolab']['filter']['reject_forged_from_header'] = false;
* - %2$s denotes the address in the original from header
* - %3$s denotes the name part in the original from header if any
*/
-// $conf['kolab']['filter']['untrusted_subject_insert'] = '(UNTRUSTED, sender is <%1$s>)';
-// $conf['kolab']['filter']['unauthenticated_subject_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)';
+// $conf['kolab']['filter']['unauthenticated_from_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)';
/* Should we allow forwarded ical messages from Outlook
* by encapsulating them in a MIME multipart