gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.40, 1.41

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
kolab/issue3967 (UNTRUSTED vs. UNAUTHENTICATED, distinction considered harmful), kolab/issue3962 (Names of config variables for untrusted text missleading)

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- resmgr.conf.template.in	22 Feb 2010 06:34:46 -0000	1.40
+++ resmgr.conf.template.in	15 Apr 2010 14:45:38 -0000	1.41
@@ -122,8 +122,7 @@
  * -  %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