Move bind9/check to isccfg/check
Since it is part of the configuration machinery
This commit is contained in:
@@ -6,6 +6,7 @@ libisccfg_ladir = $(includedir)/isccfg
|
||||
libisccfg_la_HEADERS = \
|
||||
include/isccfg/aclconf.h \
|
||||
include/isccfg/cfg.h \
|
||||
include/isccfg/check.h \
|
||||
include/isccfg/duration.h \
|
||||
include/isccfg/grammar.h \
|
||||
include/isccfg/kaspconf.h \
|
||||
@@ -15,6 +16,7 @@ libisccfg_la_HEADERS = \
|
||||
libisccfg_la_SOURCES = \
|
||||
$(libisccfg_la_HEADERS) \
|
||||
aclconf.c \
|
||||
check.c \
|
||||
dnsconf.c \
|
||||
duration.c \
|
||||
kaspconf.c \
|
||||
@@ -26,12 +28,20 @@ libisccfg_la_CPPFLAGS = \
|
||||
$(AM_CPPFLAGS) \
|
||||
$(LIBISCCFG_CFLAGS) \
|
||||
$(LIBISC_CFLAGS) \
|
||||
$(LIBDNS_CFLAGS)
|
||||
$(LIBDNS_CFLAGS) \
|
||||
$(LIBNS_CFLAGS) \
|
||||
$(OPENSSL_CFLAGS)
|
||||
|
||||
libisccfg_la_LIBADD = \
|
||||
$(LIBDNS_LIBS) \
|
||||
$(LIBISC_LIBS)
|
||||
$(LIBISC_LIBS) \
|
||||
$(LIBNS_LIBS) \
|
||||
$(OPENSSL_LIBS)
|
||||
|
||||
libisccfg_la_LDFLAGS = \
|
||||
$(AM_LDFLAGS) \
|
||||
-release "$(PACKAGE_VERSION)"
|
||||
|
||||
if HAVE_DNSTAP
|
||||
libisccfg_la_CPPFLAGS += $(DNSTAP_CFLAGS)
|
||||
endif
|
||||
|
||||
6165
lib/isccfg/check.c
Normal file
6165
lib/isccfg/check.c
Normal file
File diff suppressed because it is too large
Load Diff
63
lib/isccfg/include/isccfg/check.h
Normal file
63
lib/isccfg/include/isccfg/check.h
Normal file
@@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
*
|
||||
* SPDX-License-Identifier: MPL-2.0
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
||||
*
|
||||
* See the COPYRIGHT file distributed with this work for additional
|
||||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/*! \file isccfg/check.h */
|
||||
|
||||
#include <isc/lang.h>
|
||||
#include <isc/types.h>
|
||||
|
||||
#include <isccfg/cfg.h>
|
||||
|
||||
#ifndef MAX_MIN_CACHE_TTL
|
||||
#define MAX_MIN_CACHE_TTL 90
|
||||
#endif /* MAX_MIN_CACHE_TTL */
|
||||
|
||||
#ifndef MAX_MIN_NCACHE_TTL
|
||||
#define MAX_MIN_NCACHE_TTL 90
|
||||
#endif /* MAX_MIN_NCACHE_TTL */
|
||||
|
||||
#ifndef MAX_MAX_NCACHE_TTL
|
||||
#define MAX_MAX_NCACHE_TTL 7 * 24 * 3600
|
||||
#endif /* MAX_MAX_NCACHE_TTL */
|
||||
|
||||
ISC_LANG_BEGINDECLS
|
||||
|
||||
isc_result_t
|
||||
isccfg_check_namedconf(const cfg_obj_t *config, bool check_plugins,
|
||||
isc_log_t *logctx, isc_mem_t *mctx);
|
||||
/*%<
|
||||
* Check the syntactic validity of a configuration parse tree generated from
|
||||
* a named.conf file.
|
||||
*
|
||||
* If 'check_plugins' is true, load plugins and check the validity of their
|
||||
* parameters as well.
|
||||
*
|
||||
* Requires:
|
||||
*\li config is a valid parse tree
|
||||
*
|
||||
*\li logctx is a valid logging context.
|
||||
*
|
||||
* Returns:
|
||||
* \li #ISC_R_SUCCESS
|
||||
* \li #ISC_R_FAILURE
|
||||
*/
|
||||
|
||||
isc_result_t
|
||||
isccfg_check_key(const cfg_obj_t *config, isc_log_t *logctx);
|
||||
/*%<
|
||||
* Same as isccfg_check_namedconf(), but for a single 'key' statement.
|
||||
*/
|
||||
|
||||
ISC_LANG_ENDDECLS
|
||||
@@ -2524,7 +2524,7 @@ static cfg_type_t cfg_type_key = { "key", cfg_parse_named_map,
|
||||
/*%
|
||||
* Clauses that can be found in a 'server' statement.
|
||||
*
|
||||
* Please update lib/bind9/check.c and
|
||||
* Please update lib/isccfg/check.c and
|
||||
* bin/tests/system/checkconf/good-server-christmas-tree.conf.in to
|
||||
* exercise the new clause when adding new clauses.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user