DMARC: Fix forensic-report envelopes to permit non-null. Bug 1896

[exim.git] / src / src / macro_predef.c

diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 0d70826bbba66fbb2e131eaf850f571774b28066..0a22eec2f4c9987d97d41c71bcf2bd309b344e9c 100644 (file)
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -180,10 +180,13 @@ due to conflicts with other common macros. */
 #ifdef EXPERIMENTAL_SRS
   builtin_macro_create(US"_HAVE_SRS");
 #endif
+#ifdef EXPERIMENTAL_ARC
+  builtin_macro_create(US"_HAVE_ARC");
+#endif
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   builtin_macro_create(US"_HAVE_BRIGHTMAIL");
 #endif
-#ifdef EXPERIMENTAL_DANE
+#ifdef SUPPORT_DANE
   builtin_macro_create(US"_HAVE_DANE");
 #endif
 #ifdef EXPERIMENTAL_DCC
@@ -195,6 +198,9 @@ due to conflicts with other common macros. */
 #ifdef EXPERIMENTAL_DSN_INFO
   builtin_macro_create(US"_HAVE_DSN_INFO");
 #endif
+#ifdef EXPERIMENTAL_REQUIRETLS
+  builtin_macro_create(US"_HAVE_REQTLS");
+#endif
 
 #ifdef LOOKUP_LSEARCH
   builtin_macro_create(US"_HAVE_LOOKUP_LSEARCH");
@@ -278,6 +284,7 @@ options_main();
 options_routers();
 options_transports();
 options_auths();
+options_logging();
 }
 
 static void