From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 9 Oct 2025 08:47:47 +0000 (+0200)
Subject: Fix test-signers: if there's no ref to OpenSSL it fails
X-Git-Tag: rec-5.4.0-alpha1~220^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101947cc4cbcd75c22062a359b969e4c458fd8d8;p=thirdparty%2Fpdns.git

Fix test-signers: if there's no ref to OpenSSL it fails

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/dnssec.hh b/pdns/dnssec.hh
index 2387f0ab69..eba36af352 100644
--- a/pdns/dnssec.hh
+++ b/pdns/dnssec.hh
@@ -27,7 +27,6 @@
 class DNSSEC
 {
 public:
-
   enum keytype_t : uint8_t
   {
     KSK,
diff --git a/pdns/dnsseckeeper.hh b/pdns/dnsseckeeper.hh
index 311dca74d7..117cb03f63 100644
--- a/pdns/dnsseckeeper.hh
+++ b/pdns/dnsseckeeper.hh
@@ -40,7 +40,6 @@ using namespace ::boost::multi_index;
 class DNSSECKeeper : public DNSSEC
 {
 public:
-  DNSSECKeeper(const DNSSECKeeper&) = delete;
 
   struct KeyMetaData
   {
@@ -75,6 +74,9 @@ public:
       delete d_keymetadb;
   }
 
+  DNSSECKeeper(const DNSSECKeeper&) = delete;
+  DNSSECKeeper operator=(const DNSSECKeeper&) = delete;
+
   static uint64_t dbdnssecCacheSizes(const std::string& str);
   static void clearAllCaches();
   static bool clearKeyCache(const ZoneName& name);
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 8b896cb067..8020f7869f 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -232,7 +232,6 @@ pdns_recursor_SOURCES = \
 	tcpiohandler.cc tcpiohandler.hh \
 	threadname.hh threadname.cc \
 	tsigverifier.cc tsigverifier.hh \
-	ueberbackend.hh \
 	unix_utility.cc \
 	utility.hh \
 	uuid-utils.hh uuid-utils.cc \
diff --git a/pdns/recursordist/dnsseckeeper.hh b/pdns/recursordist/dnsseckeeper.hh
deleted file mode 120000
index 20aa801721..0000000000
--- a/pdns/recursordist/dnsseckeeper.hh
+++ /dev/null
@@ -1 +0,0 @@
-../dnsseckeeper.hh
\ No newline at end of file
diff --git a/pdns/test-signers.cc b/pdns/test-signers.cc
index 33b274ddc3..7fee63402c 100644
--- a/pdns/test-signers.cc
+++ b/pdns/test-signers.cc
@@ -16,7 +16,10 @@
 #include "dnssecinfra.hh"
 #include "misc.hh"
 
-#include <cstdio>
+// Include below is essential, otherwise we get failures I do not understand, maybe some runtime
+// value does not get initialized?
+#include <openssl/sha.h>
+
 #include <unordered_map>
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables): Boost stuff.