From 5a234a89193bcaaf5b3f7dc1a99bb6c1b10c9df3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 18 Dec 2013 02:56:40 -0500
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
---
install/tpl/opensuse_amavisd_conf.master | 3 ++-
install/tpl/amavisd_user_config.master | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master
index f377955..d831a41 100644
--- a/install/tpl/amavisd_user_config.master
+++ b/install/tpl/amavisd_user_config.master
@@ -78,7 +78,8 @@
# DKIM
$enable_dkim_verification = 1;
-$enable_dkim_signing = 1; # load DKIM signing code,
+$enable_dkim_signing = 1; # load DKIM signing code
+$signed_header_fields{'received'} = 0; # turn off signing of Received
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
diff --git a/install/tpl/opensuse_amavisd_conf.master b/install/tpl/opensuse_amavisd_conf.master
index 5f9f867..99d90dd 100644
--- a/install/tpl/opensuse_amavisd_conf.master
+++ b/install/tpl/opensuse_amavisd_conf.master
@@ -781,7 +781,8 @@
# DKIM
$enable_dkim_verification = 1;
-$enable_dkim_signing = 1; # load DKIM signing code,
+$enable_dkim_signing = 1; # load DKIM signing code
+$signed_header_fields{'received'} = 0; # turn off signing of Received
@dkim_signature_options_bysender_maps = (
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
--
Gitblit v1.9.1