diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 7c22ea289d..652c71903a 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 931340fe53..633fc5d122 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 b3153d16e7..6f591e79b4 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 },