From 828c7ad87ceeabfc57ae31dbe228295e670cdf31 Mon Sep 17 00:00:00 2001
From: Colin Vidal <colin@isc.org>
Date: Thu, 19 Dec 2024 15:00:00 +0100
Subject: [PATCH] fixup! Introduction of cfgmgr

---
 lib/isc/Makefile.am                                     | 4 ++++
 lib/{isccfg => isc}/cfgmgr.c                            | 3 +--
 lib/{isccfg/include/isccfg => isc/include/isc}/cfgmgr.h | 0
 lib/isccfg/Makefile.am                                  | 6 ++----
 tests/isc/Makefile.am                                   | 1 +
 tests/{isccfg => isc}/cfgmgr_test.c                     | 4 ++--
 tests/isccfg/Makefile.am                                | 3 +--
 7 files changed, 11 insertions(+), 10 deletions(-)
 rename lib/{isccfg => isc}/cfgmgr.c (99%)
 rename lib/{isccfg/include/isccfg => isc/include/isc}/cfgmgr.h (100%)
 rename tests/{isccfg => isc}/cfgmgr_test.c (99%)

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 277e5e951e..e23d93ac13 100644
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -14,6 +14,7 @@ libisc_la_HEADERS =			\
 	include/isc/base32.h		\
 	include/isc/base64.h		\
 	include/isc/buffer.h		\
+	include/isc/cfgmgr.h		\
 	include/isc/commandline.h	\
 	include/isc/condition.h		\
 	include/isc/counter.h		\
@@ -122,6 +123,7 @@ libisc_la_SOURCES =		\
 	backtrace.c		\
 	base32.c		\
 	base64.c		\
+	cfgmgr.c		\
 	commandline.c		\
 	condition.c		\
 	counter.c		\
@@ -214,6 +216,7 @@ libisc_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)		\
 	$(LIBISC_CFLAGS)	\
 	$(LIBUV_CFLAGS)		\
+	$(LMDB_CFLAGS)		\
 	$(OPENSSL_CFLAGS)	\
 	$(ZLIB_CFLAGS)
 
@@ -223,6 +226,7 @@ libisc_la_LDFLAGS =		\
 
 libisc_la_LIBADD =		\
 	$(LIBUV_LIBS)		\
+	$(LMDB_LIBS)		\
 	$(OPENSSL_LIBS)		\
 	$(ZLIB_LIBS)
 
diff --git a/lib/isccfg/cfgmgr.c b/lib/isc/cfgmgr.c
similarity index 99%
rename from lib/isccfg/cfgmgr.c
rename to lib/isc/cfgmgr.c
index 2d2e9481e2..fcb77f17af 100644
--- a/lib/isccfg/cfgmgr.c
+++ b/lib/isc/cfgmgr.c
@@ -21,8 +21,7 @@
 #include <isc/random.h>
 #include <isc/thread.h>
 #include <isc/util.h>
-
-#include <isccfg/cfgmgr.h>
+#include <isc/cfgmgr.h>
 
 /*
  * See MDB_MAXKEYSIZE documentation, but not accessible as defined in
diff --git a/lib/isccfg/include/isccfg/cfgmgr.h b/lib/isc/include/isc/cfgmgr.h
similarity index 100%
rename from lib/isccfg/include/isccfg/cfgmgr.h
rename to lib/isc/include/isc/cfgmgr.h
diff --git a/lib/isccfg/Makefile.am b/lib/isccfg/Makefile.am
index 1be429dfd3..c5960400f8 100644
--- a/lib/isccfg/Makefile.am
+++ b/lib/isccfg/Makefile.am
@@ -10,8 +10,7 @@ libisccfg_la_HEADERS =			\
 	include/isccfg/duration.h	\
 	include/isccfg/grammar.h	\
 	include/isccfg/kaspconf.h	\
-	include/isccfg/namedconf.h	\
-	include/isccfg/cfgmgr.h
+	include/isccfg/namedconf.h
 
 libisccfg_la_SOURCES =			\
 	$(libisccfg_la_HEADERS)		\
@@ -20,8 +19,7 @@ libisccfg_la_SOURCES =			\
 	duration.c			\
 	kaspconf.c			\
 	namedconf.c			\
-	parser.c			\
-	cfgmgr.c
+	parser.c
 
 libisccfg_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
diff --git a/tests/isc/Makefile.am b/tests/isc/Makefile.am
index cbe2d8bba2..36952ee73d 100644
--- a/tests/isc/Makefile.am
+++ b/tests/isc/Makefile.am
@@ -15,6 +15,7 @@ check_PROGRAMS =	\
 	ascii_test	\
 	async_test	\
 	buffer_test	\
+	cfgmgr_test	\
 	counter_test	\
 	dnsstream_utils_test \
 	errno_test	\
diff --git a/tests/isccfg/cfgmgr_test.c b/tests/isc/cfgmgr_test.c
similarity index 99%
rename from tests/isccfg/cfgmgr_test.c
rename to tests/isc/cfgmgr_test.c
index 1802585d92..c39cbc0e74 100644
--- a/tests/isccfg/cfgmgr_test.c
+++ b/tests/isc/cfgmgr_test.c
@@ -20,9 +20,9 @@
 #define UNIT_TESTING
 #include <cmocka.h>
 
-#include <isccfg/cfgmgr.h>
+#include <isc/cfgmgr.h>
 
-#include "../../lib/isccfg/cfgmgr.c"
+#include "../../lib/isc/cfgmgr.c"
 
 #include <tests/isc.h>
 
diff --git a/tests/isccfg/Makefile.am b/tests/isccfg/Makefile.am
index b7920067f4..1a1887d917 100644
--- a/tests/isccfg/Makefile.am
+++ b/tests/isccfg/Makefile.am
@@ -16,7 +16,6 @@ LDADD +=			\
 check_PROGRAMS =		\
 	duration_test		\
 	parser_test		\
-	grammar_test		\
-	cfgmgr_test
+	grammar_test
 
 include $(top_srcdir)/Makefile.tests