base.m4, config.m4: Remove spaces from the `dkim_sign_headers' setting.

It turns out that Exim secretly requires there to be no spaces here.
Or, more specifically, it compares the header names in the message
against the list entries between the colons without stripping spaces, so
none of them will match.

diff --git a/base.m4 b/base.m4
index 7c9cdb7501ba4f6c15dde77179d88b7d6e5e2bf2..799e3ee0f4389e5b9bf2ba8659d9b813016299da 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -451,7 +451,7 @@ m4_define(<:DKIM_SIGN:>,
                        {CONF_dkim_keys_dir/$value/active/$dkim_selector.priv}:>)
        dkim_canon = relaxed
        dkim_strict = true
                        {CONF_dkim_keys_dir/$value/active/$dkim_selector.priv}:>)
        dkim_canon = relaxed
        dkim_strict = true

-       dkim_sign_headers = CONF_dkim_headers : \
+       dkim_sign_headers = CONF_dkim_headers:\

                X-CONF_header_token-DKIM-Key-Publication
        headers_add = \
                ${if DKIM_SIGN_P \
                X-CONF_header_token-DKIM-Key-Publication
        headers_add = \
                ${if DKIM_SIGN_P \

diff --git a/config.m4 b/config.m4
index 5e3cc9b9ddb3847e2efec3e972de07e56a95a937..7fba5590f05fa4e3ecb80489aed29ee099360fa7 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -81,16 +81,16 @@ DEFCONF(relay_clients, <m4_dnl
 )
 
 ## DKIM headers list.
 )
 
 ## DKIM headers list.

-DEFCONF(dkim_headers, m4_dnl
-References : In-Reply-To : Subject : To : Date : Message-ID : m4_dnl
-From : Sender : Reply-To : Cc : m4_dnl
-Resent-Date : Resent-From : Resent-Sender : Resent-To : Resent-Cc : m4_dnl
-Resent-Message-ID : m4_dnl
-Content-Transfer-Encoding : Content-Type : MIME-Version : m4_dnl
-Content-ID : Content-Description : m4_dnl
-List-Id : List-Help : List-Unsubscribe : List-Subscribe : m4_dnl
-List-Post : List-Owner : List-Archive m4_dnl
-)
+## Surprise!  Internal whitespace isn't allowed here.
+DEFCONF(dkim_headers,m4_dnl
+References:In-Reply-To:Subject:To:Date:Message-ID:m4_dnl
+From:Sender:Reply-To:Cc:m4_dnl
+Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:m4_dnl
+Resent-Message-ID:m4_dnl
+Content-Transfer-Encoding:Content-Type:MIME-Version:m4_dnl
+Content-ID:Content-Description:m4_dnl
+List-Id:List-Help:List-Unsubscribe:List-Subscribe:m4_dnl
+List-Post:List-Owner:List-Archive)

 
 ## TLS certificate list.
 DEFCONF(certlist,
 
 ## TLS certificate list.
 DEFCONF(certlist,