wilde: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.34.2.2, 1.34.2.3

[cvs at kolab.org]

Author: wilde

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

Modified Files:
      Tag: kolab_2_2_branch
	resmgr.conf.template.in 
Log Message:
Made configuration of untrusted messages more flexible. 
Fixes kolab/issue973 (Rewritten from shown inconveniently in kontact)

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -u -d -r1.34.2.2 -r1.34.2.3
--- resmgr.conf.template.in	10 Nov 2009 20:42:00 -0000	1.34.2.2
+++ resmgr.conf.template.in	25 Nov 2009 13:42:20 -0000	1.34.2.3
@@ -115,9 +115,14 @@
 $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