mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

Obsolete CLAUSEFLAG NOOP

Browse Source 
The clause flag 'not operational' is promoted to 'not configured'.
This commit is contained in:
Matthijs Mekking 2020-12-08 11:34:15 +01:00
parent ff1957e95b
commit dda3a68efc
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/isccfg/include/isccfg/grammar.h
View File

@ -50,9 +50,7 @@
#define CFG_CLAUSEFLAG_NOTCONFIGURED 0x00000080 #define CFG_CLAUSEFLAG_NOTCONFIGURED 0x00000080
/*% A option for a experimental feature. */ /*% A option for a experimental feature. */
#define CFG_CLAUSEFLAG_EXPERIMENTAL 0x00000100 #define CFG_CLAUSEFLAG_EXPERIMENTAL 0x00000100
/*% A configuration option that is ineffective due to /* obsolete: #define CFG_CLAUSEFLAG_NOOP 0x00000200 */
* compile time options, but is harmless. */
#define CFG_CLAUSEFLAG_NOOP 0x00000200
/*% Clause will be obsolete in a future release (logs a warning) */ /*% Clause will be obsolete in a future release (logs a warning) */
#define CFG_CLAUSEFLAG_DEPRECATED 0x00000400 #define CFG_CLAUSEFLAG_DEPRECATED 0x00000400
/*% Clause has been obsolete so long that it's now a fatal error */ /*% Clause has been obsolete so long that it's now a fatal error */

2
lib/isccfg/namedconf.c
View File

@ -2030,7 +2030,7 @@ static cfg_clausedef_t view_clauses[] = {
#ifdef HAVE_LMDB #ifdef HAVE_LMDB
{ "lmdb-mapsize", &cfg_type_sizeval, 0 }, { "lmdb-mapsize", &cfg_type_sizeval, 0 },
#else /* ifdef HAVE_LMDB */ #else /* ifdef HAVE_LMDB */
{ "lmdb-mapsize", &cfg_type_sizeval, CFG_CLAUSEFLAG_NOOP }, { "lmdb-mapsize", &cfg_type_sizeval, CFG_CLAUSEFLAG_NOTCONFIGURED },
#endif /* ifdef HAVE_LMDB */ #endif /* ifdef HAVE_LMDB */
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 },

8
lib/isccfg/parser.c
View File

@ -2462,13 +2462,6 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
"should be removed ", "should be removed ",
clause->name); clause->name);
} }
if ((clause->flags & CFG_CLAUSEFLAG_NOOP) != 0) {
cfg_parser_warning(pctx, 0,
"option '%s' was not "
"enabled at compile time "
"(ignored)",
clause->name);
}
if ((clause->flags & CFG_CLAUSEFLAG_NOTCONFIGURED) != 0) { if ((clause->flags & CFG_CLAUSEFLAG_NOTCONFIGURED) != 0) {
cfg_parser_error(pctx, 0, cfg_parser_error(pctx, 0,
@ -2719,7 +2712,6 @@ static struct flagtext {
{ CFG_CLAUSEFLAG_NOTCONFIGURED, "not configured" }, { CFG_CLAUSEFLAG_NOTCONFIGURED, "not configured" },
{ CFG_CLAUSEFLAG_MULTI, "may occur multiple times" }, { CFG_CLAUSEFLAG_MULTI, "may occur multiple times" },
{ CFG_CLAUSEFLAG_EXPERIMENTAL, "experimental" }, { CFG_CLAUSEFLAG_EXPERIMENTAL, "experimental" },
{ CFG_CLAUSEFLAG_NOOP, "non-operational" },
{ CFG_CLAUSEFLAG_DEPRECATED, "deprecated" }, { CFG_CLAUSEFLAG_DEPRECATED, "deprecated" },
{ CFG_CLAUSEFLAG_ANCIENT, "ancient" }, { CFG_CLAUSEFLAG_ANCIENT, "ancient" },
{ 0, NULL } }; { 0, NULL } };