gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.6, 1.7

cvs at kolab.org cvs at kolab.org
Thu Mar 22 12:51:44 CET 2007


Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
	* templates/resmgr.conf.template.in: 

	Prevent error messages like "No configuration variable
	corresponding to `kolabfilter-verify-from-header' exists" within
	the kolabconf log. Resolves:
	kolab/issue1638 (https://intevation.de/roundup/kolab/issue1638)


Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- resmgr.conf.template.in	6 Feb 2007 14:53:43 -0000	1.6
+++ resmgr.conf.template.in	22 Mar 2007 11:51:42 -0000	1.7
@@ -27,14 +27,26 @@
 
 // Should we make sure that the sender and From header match for mail
 // that origins on this server?
+@@@if kolabfilter-verify-from-header@@@
 $params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
+@@@else@@@
+$params['verify_from_header'] = false;
+@@@endif@@@
 
 // Should the Sender: header be used over From: if present?
+@@@if kolabfilter-allow-sender-header@@@
 $params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
+@@@else@@@
+$params['allow_sender_header'] = false;
+@@@endif@@@
 
 // Should reject messages with From headers that dont match
 // the envelope? Default is to rewrite the header
+@@@if kolabfilter-reject-forged-from-header@@@
 $params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+@@@else@@@
+$params['reject_forged_from_header'] = false;
+@@@endif@@@
 
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart





More information about the commits mailing list