summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2007-03-22 11:51:42 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2007-03-22 11:51:42 (GMT)
commitfaf68103d7bbd3157328649d46aedf7d9a7e88d4 (patch)
treea5cee4ca2a49e28f0e9a1c2334b5c9af4ff1947d
parentaf7e1dddf9ec289f5b5955e6bf2aef6940d74507 (diff)
downloadkolab-conf-faf68103d7bbd3157328649d46aedf7d9a7e88d4.tar.gz
* 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)
-rw-r--r--conf/templates/resmgr.conf.template.in12
1 files changed, 12 insertions, 0 deletions
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index b4edfc3..81664ff 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -27,14 +27,26 @@ $params['append_domains'] = false;
// 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