summaryrefslogtreecommitdiff
path: root/conf/templates/resmgr.conf.template.in
diff options
context:
space:
mode:
Diffstat (limited to 'conf/templates/resmgr.conf.template.in')
-rw-r--r--conf/templates/resmgr.conf.template.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 7ad9aea..4fb450c 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -115,9 +115,14 @@ $conf['kolab']['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-
$conf['kolab']['filter']['reject_forged_from_header'] = false;
@@@endif@@@
-/* Text to be inserted in From: when rewriting untrusted mails */
-// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+/* Text to be inserted in From: when rewriting untrusted mails
+ * The following format specifiers can be used:
+ * - %1$s denotes the envelope sender
+ * - %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)";
/* Should we allow forwarded ical messages from Outlook
* by encapsulating them in a MIME multipart