From: Matthijs Mekking Date: Tue, 8 Dec 2020 10:55:42 +0000 (+0100) Subject: Remove the option 'cleaning-interval' X-Git-Tag: v9.17.10~31^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a889ed38eff3ea9add384be5a074d2d737918c2c;p=thirdparty%2Fbind9.git Remove the option 'cleaning-interval' Obsoleted in 9.15, we can remove the option in 9.17. --- diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 7c22ea289d0..652c71903ac 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -3062,9 +3062,6 @@ system. Periodic Task Intervals ^^^^^^^^^^^^^^^^^^^^^^^ -``cleaning-interval`` - This option is obsolete. - ``heartbeat-interval`` The server performs zone maintenance tasks for all zones marked as ``dialup`` whenever this interval expires. The default is 60 diff --git a/lib/dns/cache.c b/lib/dns/cache.c index 931340fe539..633fc5d1224 100644 --- a/lib/dns/cache.c +++ b/lib/dns/cache.c @@ -76,7 +76,7 @@ typedef struct cache_cleaner cache_cleaner_t; typedef enum { - cleaner_s_idle, /*%< Waiting for cleaning-interval to expire. */ + cleaner_s_idle, /*%< Waiting for cleaning interval to expire. */ cleaner_s_busy, /*%< Currently cleaning. */ cleaner_s_done /*%< Freed enough memory after being overmem. */ } cleaner_state_t; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index b3153d16e78..6f591e79b4e 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1977,7 +1977,7 @@ static cfg_clausedef_t view_clauses[] = { { "cache-file", &cfg_type_qstring, 0 }, { "catalog-zones", &cfg_type_catz, 0 }, { "check-names", &cfg_type_checknames, CFG_CLAUSEFLAG_MULTI }, - { "cleaning-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, + { "cleaning-interval", &cfg_type_uint32, CFG_CLAUSEFLAG_ANCIENT }, { "clients-per-query", &cfg_type_uint32, 0 }, { "deny-answer-addresses", &cfg_type_denyaddresses, 0 }, { "deny-answer-aliases", &cfg_type_denyaliases, 0 },