[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    thomas: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.7,
From:       cvs () kolab ! org
Date:       2007-04-26 16:22:25
Message-ID: 20070426162225.DF6901005BA () lists ! intevation ! de
[Download RAW message or body]

Author: thomas

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resmgr.conf.template.in	22 Mar 2007 11:51:42 -0000	1.7
+++ resmgr.conf.template.in	26 Apr 2007 16:22:23 -0000	1.8
@@ -33,6 +33,10 @@
 $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,13 +52,13 @@
 $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


_______________________________________________
Kolab-commits mailing list
Kolab-commits@kolab.org
https://kolab.org/mailman/listinfo/kolab-commits
[prev in list] [next in list] [prev in thread] [next in thread]