conf: ignore obsolete zone-related options

diff --git a/src/knot/conf/tools.c b/src/knot/conf/tools.c
index 4f2e9d6aff1d4b492f633b52618233d8b07d5b78..ac06ae9105ff759139095d994bb8e94a3c1bb9ea 100644 (file)
--- a/src/knot/conf/tools.c
+++ b/src/knot/conf/tools.c
@@ -346,7 +346,7 @@ int check_module_id(
        conf_val_t val = conf_rawid_get_txn(args->extra->conf, args->extra->txn, \
                                            section, old_item, args->id, args->id_len); \
        if (val.code == KNOT_EOK) { \
-               CONF_LOG(LOG_NOTICE, "option '%s.%s' is obsolete, " \
+               CONF_LOG(LOG_NOTICE, "option '%s.%s' has no effect, " \
                                     "use option '%s.%s' instead", \
                                     &section[1], &old_item[1], \
                                     &section[1], &new_item[1]); \

diff --git a/src/knot/events/handlers/refresh.c b/src/knot/events/handlers/refresh.c
index 3b82a4f2a243524c9ad436fdedbc5e18969eb021..4e3d54e9ea803d3e7f8df0e391b8db0f758041ae 100644 (file)
--- a/src/knot/events/handlers/refresh.c
+++ b/src/knot/events/handlers/refresh.c
@@ -1082,9 +1082,6 @@ static const knot_layer_api_t REFRESH_API = {
 static size_t max_zone_size(conf_t *conf, const knot_dname_t *zone)
 {
        conf_val_t val = conf_zone_get(conf, C_ZONE_MAX_SIZE, zone);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf, C_MAX_ZONE_SIZE, zone);
-       }
        return conf_int(&val);
 }
 
@@ -1213,18 +1210,12 @@ static int try_refresh(conf_t *conf, zone_t *zone, const conf_remote_t *master,
 static int64_t min_refresh_interval(conf_t *conf, const knot_dname_t *zone)
 {
        conf_val_t val = conf_zone_get(conf, C_REFRESH_MIN_INTERVAL, zone);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf, C_MIN_REFRESH_INTERVAL, zone);
-       }
        return conf_int(&val);
 }
 
 static int64_t max_refresh_interval(conf_t *conf, const knot_dname_t *zone)
 {
        conf_val_t val = conf_zone_get(conf, C_REFRESH_MAX_INTERVAL, zone);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf, C_MAX_REFRESH_INTERVAL, zone);
-       }
        return conf_int(&val);
 }
 

diff --git a/src/knot/journal/journal_basic.c b/src/knot/journal/journal_basic.c
index 105a10b1330adaa5c369677a60b451f6cef701b3..15386fc6ca99d2352fab9f9e711cc146922afb84 100644 (file)
--- a/src/knot/journal/journal_basic.c
+++ b/src/knot/journal/journal_basic.c
@@ -71,17 +71,11 @@ bool journal_allow_flush(zone_journal_t j)
 size_t journal_conf_max_usage(zone_journal_t j)
 {
        conf_val_t val = conf_zone_get(conf(), C_JOURNAL_MAX_USAGE, j.zone);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf(), C_MAX_JOURNAL_USAGE, j.zone);
-       }
        return conf_int(&val);
 }
 
 size_t journal_conf_max_changesets(zone_journal_t j)
 {
        conf_val_t val = conf_zone_get(conf(), C_JOURNAL_MAX_DEPTH, j.zone);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf(), C_MAX_JOURNAL_DEPTH, j.zone);
-       }
        return conf_int(&val);
 }

diff --git a/src/knot/updates/zone-update.c b/src/knot/updates/zone-update.c
index 65314f08135aa6b1bcea2d4ea85e23cc0d8fb9bd..5cee6e4bb209eec7f118a7e689a4f25fb87c1cc7 100644 (file)
--- a/src/knot/updates/zone-update.c
+++ b/src/knot/updates/zone-update.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -890,9 +890,6 @@ int zone_update_commit(conf_t *conf, zone_update_t *update)
 
        /* Check the zone size. */
        conf_val_t val = conf_zone_get(conf, C_ZONE_MAX_SIZE, update->zone->name);
-       if (val.code != KNOT_EOK) {
-               val = conf_zone_get(conf, C_MAX_ZONE_SIZE, update->zone->name);
-       }
        size_t size_limit = conf_int(&val);
 
        if (update->new_cont->size > size_limit) {