Rework SPA fix to avoid overflows. Bug 2571

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

diff --git a/src/src/dane.c b/src/src/dane.c
index 20dfe5b180a28fc9ac1e3908110d20dfd955b48d..5ba61961a7dac24fc2cf017192743c04dd2ed84d 100644 (file)
--- a/src/src/dane.c
+++ b/src/src/dane.c
@@ -24,22 +24,25 @@ reference itself to stop picky compilers complaining that it is unused, and put
 in a dummy argument to stop even pickier compilers complaining about infinite
 loops. */
 
-#ifndef EXPERIMENTAL_DANE
+#ifndef SUPPORT_DANE
 static void dummy(int x) { dummy(x-1); }
 #else
 
 /* Enabling DANE without enabling TLS cannot work. Abort the compilation. */
-# ifndef SUPPORT_TLS
+# ifdef DISABLE_TLS
 #  error DANE support requires that TLS support must be enabled. Abort build.
 # endif
 
-# ifdef USE_GNUTLS
-#  include "dane-gnu.c"
-# else
+/* DNSSEC support is also required */
+# ifndef RES_USE_DNSSEC
+#  error DANE support requires that the DNS resolver library supports DNSSEC
+# endif
+
+# ifdef USE_OPENSSL
 #  include "dane-openssl.c"
 # endif
 
 
-#endif  /* EXPERIMENTAL_DANE */
+#endif  /* SUPPORT_DANE */
 
 /* End of dane.c */