GnuTLS: lose DH-param setup, for recent library versions where no longer needed

[user/henk/code/exim.git] / src / src / globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index 15fb0898c72714ed2c67959083df1b853fba6d04..ad6b38ec5661a5df245d3e2c66fa6c3b9548cade 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -239,7 +239,7 @@ struct global_flags f =
 #ifndef DISABLE_DKIM
        .dkim_disable_verify      = FALSE,
 #endif
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
        .dmarc_has_been_checked  = FALSE,
        .dmarc_disable_verify    = FALSE,
        .dmarc_enable_forensic   = FALSE,
@@ -830,12 +830,15 @@ void   *dkim_signatures            = NULL;
 uschar *dkim_signers             = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
+uschar *dkim_verify_hashes       = US"sha256:sha512:sha1";
+uschar *dkim_verify_keytypes     = US"ed25519:rsa";
+BOOL   dkim_verify_minimal      = FALSE;
 uschar *dkim_verify_overall      = NULL;
 uschar *dkim_verify_signers      = US"$dkim_signers";
 uschar *dkim_verify_status      = NULL;
 uschar *dkim_verify_reason      = NULL;
 #endif
-#ifdef EXPERIMENTAL_DMARC
+#ifdef SUPPORT_DMARC
 uschar *dmarc_domain_policy     = NULL;
 uschar *dmarc_forensic_sender   = NULL;
 uschar *dmarc_history_file      = NULL;