base.m4: Nearly set DKIM expiry time.

[exim-config] / base.m4

diff --git a/base.m4 b/base.m4
index 1b671ef..d64b88b 100644 (file)
--- a/base.m4
+++ b/base.m4
@@ -424,7 +424,8 @@ m4_define(<:DKIM_SIGN_P:>,
               {!def:h_DKIM-Signature:} \
               {!def:h_List-ID:} \
               {or {{def:authenticated_id} \
-                   {def:authenticated_sender}}}}:>)
+                   {def:authenticated_sender}}} \
+              {bool {DKIM_KEYS_INSTANCE(<:{true}:>, <:{false}:>)}}}:>)
 
 m4_define(<:DKIM_KEYS_INSTANCE:>,
        <:${lookup {${domain:$h_From:}} partial0-lsearch \
@@ -446,6 +447,7 @@ m4_define(<:DKIM_SIGN:>,
                ${if DKIM_SIGN_P \
                        {DKIM_KEYS_INSTANCE({${domain:$h_From:}})}}
        dkim_selector = DKIM_KEYS_INFO(<:{KV(k)}:>)
+       ##dkim_timestamps = m4_eval(<:7*24*60*60:>)
        dkim_private_key = \
                DKIM_KEYS_INSTANCE(<:m4_dnl
                        {CONF_dkim_keys_dir/$value/active/$dkim_selector.priv}:>)
@@ -469,11 +471,13 @@ m4_define(<:DKIM_SIGN:>,
                ${if DKIM_SIGN_P \
                        {DKIM_KEYS_INFO(<:m4_dnl
                                {X-CONF_header_token-DKIM-Key-Publication: \
-                                       DKIM signature not suitable for \
-                                       as evidence after delivery; \
+                                       DKIM signature not suitable \
+                                       as evidence after delivery;\n\t\
                                        DKIM private key KV(k) will be \
-                                       published at KV(u) on or before \
-                                       KV(tpub)}:>)}}:>)
+                                       published\n\t\
+                                       at KV(u)\n\t\
+                                       on or before KV(tpub)}:>)}}:>)
+
 
 m4_define(<:SMTP_DELIVERY:>,
        <:## Prevent sending messages with overly long lines.  The use of