Obsolete CLAUSEFLAG NOOP

The clause flag 'not operational' is promoted to 'not configured'.

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

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index b17b978c5c06de22879e4094e1e96db7b63bbab2..007ede844e54cb6fd019e3225bce6c78756200c3 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2030,7 +2030,7 @@ static cfg_clausedef_t view_clauses[] = {
 #ifdef HAVE_LMDB
        { "lmdb-mapsize", &cfg_type_sizeval, 0 },
 #else  /* ifdef HAVE_LMDB */
-       { "lmdb-mapsize", &cfg_type_sizeval, CFG_CLAUSEFLAG_NOOP },
+       { "lmdb-mapsize", &cfg_type_sizeval, CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif /* ifdef HAVE_LMDB */
        { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
        { "max-cache-size", &cfg_type_sizeorpercent, 0 },

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 9d13d0186e9c691daf399faf8081a4b067cba9e4..5d9790c32d3f1131b47cbfe79a4b44bbca436468 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -2462,13 +2462,6 @@ cfg_parse_mapbody(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
                                           "should be removed ",
                                           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) {
                        cfg_parser_error(pctx, 0,
@@ -2719,7 +2712,6 @@ static struct flagtext {
                  { CFG_CLAUSEFLAG_NOTCONFIGURED, "not configured" },
                  { CFG_CLAUSEFLAG_MULTI, "may occur multiple times" },
                  { CFG_CLAUSEFLAG_EXPERIMENTAL, "experimental" },
-                 { CFG_CLAUSEFLAG_NOOP, "non-operational" },
                  { CFG_CLAUSEFLAG_DEPRECATED, "deprecated" },
                  { CFG_CLAUSEFLAG_ANCIENT, "ancient" },
                  { 0, NULL } };