ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Move bind9/check to isccfg/check

Browse Source 
Since it is part of the configuration machinery
This commit is contained in:
Tony Finch
2022-12-16 10:39:15 +00:00
parent 6ba2579c67
commit dcb54af220
9 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/named/controlconf.c
View File

@@ -39,10 +39,9 @@
#include <isccc/symtab.h>
#include <isccc/util.h>
#include <isccfg/check.h>
#include <isccfg/namedconf.h>
#include <bind9/check.h>
#include <named/config.h>
#include <named/control.h>
#include <named/log.h>
@@ -839,7 +838,7 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
CHECK(ISC_R_NOMEMORY);
}
CHECK(bind9_check_key(key, named_g_lctx));
CHECK(isccfg_check_key(key, named_g_lctx));
(void)cfg_map_get(key, "algorithm", &algobj);
(void)cfg_map_get(key, "secret", &secretobj);

7
bin/named/server.c
View File

@@ -108,6 +108,7 @@
#include <dst/dst.h>
#include <isccfg/check.h>
#include <isccfg/grammar.h>
#include <isccfg/kaspconf.h>
#include <isccfg/namedconf.h>
@@ -117,8 +118,6 @@
#include <ns/interfacemgr.h>
#include <ns/listenlist.h>
#include <bind9/check.h>
#include <named/config.h>
#include <named/control.h>
#if defined(HAVE_GEOIP2)
@@ -8423,8 +8422,8 @@ load_configuration(const char *filename, named_server_t *server,
* checked later when the modules are actually loaded and
* registered.)
*/
result = bind9_check_namedconf(config, false, named_g_lctx,
named_g_mctx);
result = isccfg_check_namedconf(config, false, named_g_lctx,
named_g_mctx);
if (result != ISC_R_SUCCESS) {
goto cleanup_config;
}