From 9ee007ce364794e941dacfef749cf8ba3fdf99e2 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 11 Jul 2019 18:58:22 +0200
Subject: [PATCH] Move cdb.{cc ,hh} to the pdns directory

---
 modules/tinydnsbackend/Makefile.am       | 2 +-
 modules/tinydnsbackend/tinydnsbackend.cc | 5 -----
 modules/tinydnsbackend/tinydnsbackend.hh | 3 +--
 {modules/tinydnsbackend => pdns}/cdb.cc  | 0
 {modules/tinydnsbackend => pdns}/cdb.hh  | 0
 5 files changed, 2 insertions(+), 8 deletions(-)
 rename {modules/tinydnsbackend => pdns}/cdb.cc (100%)
 rename {modules/tinydnsbackend => pdns}/cdb.hh (100%)

diff --git a/modules/tinydnsbackend/Makefile.am b/modules/tinydnsbackend/Makefile.am
index 1a9448035..e6ccff16e 100644
--- a/modules/tinydnsbackend/Makefile.am
+++ b/modules/tinydnsbackend/Makefile.am
@@ -5,7 +5,7 @@ pkglib_LTLIBRARIES = libtinydnsbackend.la
 EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
 libtinydnsbackend_la_SOURCES = \
-	cdb.cc cdb.hh \
+	../../pdns/cdb.cc ../../pdns/cdb.hh \
 	tinydnsbackend.cc tinydnsbackend.hh
 
 libtinydnsbackend_la_LDFLAGS = -module -avoid-version
diff --git a/modules/tinydnsbackend/tinydnsbackend.cc b/modules/tinydnsbackend/tinydnsbackend.cc
index 0eb5adb14..0dc44461f 100644
--- a/modules/tinydnsbackend/tinydnsbackend.cc
+++ b/modules/tinydnsbackend/tinydnsbackend.cc
@@ -23,15 +23,10 @@
 #include "config.h"
 #endif
 #include "tinydnsbackend.hh"
-#include "pdns/lock.hh"
-#include <cdb.h>
 #include "pdns/misc.hh"
-#include "pdns/iputils.hh"
-#include "pdns/dnspacket.hh"
 #include "pdns/dnsrecords.hh"
 #include <utility>
 
-
 static string backendname="[TinyDNSBackend] ";
 uint32_t TinyDNSBackend::s_lastId;
 pthread_mutex_t TinyDNSBackend::s_domainInfoLock=PTHREAD_MUTEX_INITIALIZER;
diff --git a/modules/tinydnsbackend/tinydnsbackend.hh b/modules/tinydnsbackend/tinydnsbackend.hh
index bdb4888da..2de0e462e 100644
--- a/modules/tinydnsbackend/tinydnsbackend.hh
+++ b/modules/tinydnsbackend/tinydnsbackend.hh
@@ -26,11 +26,10 @@
 #include "pdns/logger.hh"
 #include "pdns/iputils.hh"
 #include "pdns/dnspacket.hh"
-#include <cdb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "cdb.hh"
+#include "pdns/cdb.hh"
 #include "pdns/lock.hh"
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
diff --git a/modules/tinydnsbackend/cdb.cc b/pdns/cdb.cc
similarity index 100%
rename from modules/tinydnsbackend/cdb.cc
rename to pdns/cdb.cc
diff --git a/modules/tinydnsbackend/cdb.hh b/pdns/cdb.hh
similarity index 100%
rename from modules/tinydnsbackend/cdb.hh
rename to pdns/cdb.hh
-- 
2.40.0