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 2387f0ab6978a5555b67a5a6ff5bbeb5d1722310..eba36af35292244a8b6c9a71904364f7d663bd8e 100644 (file)
--- 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 311dca74d7ac8bfaeea561ef69e21463044b4ae0..117cb03f6363ccf88e4d18a38b8007cf0c1ce082 100644 (file)
--- 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 8b896cb067263c549b6fb1750d171ddb8ce884c5..8020f7869fe251b87e3d4c754482d039ccec939c 100644 (file)
--- 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 (symlink)
index 20aa801..0000000
--- 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 33b274ddc3f5ba33b579c7baaf7342ba8d77cfb5..7fee63402c30d8adb2267fc5b5801e4d63f7a21e 100644 (file)
--- 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.