conf: remove 'disable-any' warning

src/knot/conf/schema.h

@@ -44,7 +44,6 @@
 #define C_DB			"\x08""database"
 #define C_DDNS_MASTER		"\x0B""ddns-master"
 #define C_DENY			"\x04""deny"
-#define C_DISABLE_ANY		"\x0B""disable-any"
 #define C_DNSKEY_TTL		"\x0A""dnskey-ttl"
 #define C_DNSSEC_POLICY		"\x0D""dnssec-policy"
 #define C_DNSSEC_SIGNING	"\x0E""dnssec-signing"
@@ -141,6 +140,7 @@
 #define C_ZSK_SIZE		"\x08""zsk-size"
 
 // Legacy items.
+#define C_DISABLE_ANY		"\x0B""disable-any"
 #define C_MAX_TIMER_DB_SIZE	"\x11""max-timer-db-size"
 #define C_MAX_JOURNAL_DB_SIZE	"\x13""max-journal-db-size"
 #define C_MAX_KASP_DB_SIZE	"\x10""max-kasp-db-size"

src/knot/conf/tools.c

@@ -650,12 +650,6 @@ int check_template(
 	CHECK_LEGACY_NAME_ID(C_TPL, C_MAX_JOURNAL_DEPTH, C_JOURNAL_MAX_DEPTH);
 	CHECK_LEGACY_NAME_ID(C_TPL, C_MAX_JOURNAL_USAGE, C_JOURNAL_MAX_USAGE);
 
-	conf_val_t any = conf_rawid_get_txn(args->extra->conf, args->extra->txn,
-	                                    C_TPL, C_DISABLE_ANY, args->id, args->id_len);
-	if (any.code == KNOT_EOK) {
-		CONF_LOG(LOG_NOTICE, "option 'disable-any' is deprecated and has no effect");
-	}
-
 	if (is_default_id(args->id, args->id_len)) {
 		conf_val_t db_storage = conf_get_txn(args->extra->conf, args->extra->txn,
 		                                     C_DB, C_STORAGE);
@@ -683,12 +677,6 @@ int check_zone(
 	CHECK_LEGACY_NAME_ID(C_ZONE, C_MAX_JOURNAL_DEPTH, C_JOURNAL_MAX_DEPTH);
 	CHECK_LEGACY_NAME_ID(C_ZONE, C_MAX_JOURNAL_USAGE, C_JOURNAL_MAX_USAGE);
 
-	conf_val_t any = conf_rawid_get_txn(args->extra->conf, args->extra->txn,
-	                                    C_TPL, C_DISABLE_ANY, args->id, args->id_len);
-	if (any.code == KNOT_EOK) {
-		CONF_LOG(LOG_NOTICE, "option 'disable-any' is deprecated and has no effect");
-	}
-
 	conf_val_t zf_load = conf_zone_get_txn(args->extra->conf, args->extra->txn,
 	                                       C_ZONEFILE_LOAD, yp_dname(args->id));
 	conf_val_t journal = conf_zone_get_txn(args->extra->conf, args->extra->txn,