Commit f92db44f authored by Mark Karpilovskij's avatar Mark Karpilovskij Committed by Daniel Salzman

conf: remove obsolete config option ixfr-from-differences

parent b617510a
......@@ -1038,22 +1038,6 @@ char* conf_zonefile_txn(
return get_filename(conf, txn, zone, file);
}
unsigned conf_zonefile_load_txn(
conf_t *conf,
knot_db_txn_t *txn,
const knot_dname_t *zone)
{
conf_val_t val = conf_zone_get_txn(conf, txn, C_ZONEFILE_LOAD, zone);
// obsolete, to be removed
if (val.code == KNOT_ENOENT) {
val = conf_zone_get_txn(conf, txn, C_IXFR_DIFF, zone);
return (conf_bool(&val) ? ZONEFILE_LOAD_DIFF : ZONEFILE_LOAD_WHOLE);
}
return conf_opt(&val);
}
char* conf_journalfile_txn(
conf_t *conf,
knot_db_txn_t *txn)
......
......@@ -592,28 +592,6 @@ static inline char* conf_zonefile(
return conf_zonefile_txn(conf, &conf->read_txn, zone);
}
/*!
* Gets the way zonefile is loaded.
*
* \param[in] conf Configuration.
* \param[in] txn Configuration DB transaction.
* \param[in] zone Zone name.
*
* \return ZONEFILE_LOAD_*
*/
unsigned conf_zonefile_load_txn(
conf_t *conf,
knot_db_txn_t *txn,
const knot_dname_t *zone
);
static inline unsigned conf_zonefile_load(
conf_t *conf,
const knot_dname_t *zone)
{
return conf_zonefile_load_txn(conf, &conf->read_txn, zone);
}
/*!
* Gets the absolute journal file path.
*
......
......@@ -292,8 +292,6 @@ static const yp_item_t desc_policy[] = {
{ C_MODULE, YP_TDATA, YP_VDATA = { 0, NULL, mod_id_to_bin, mod_id_to_txt }, \
YP_FMULTI | FLAGS, { check_modref } }, \
{ C_COMMENT, YP_TSTR, YP_VNONE }, \
/* Obsolete items. */ \
{ C_IXFR_DIFF, YP_TBOOL, YP_VNONE }, \
static const yp_item_t desc_template[] = {
{ C_ID, YP_TSTR, YP_VNONE, CONF_IO_FREF },
......
......@@ -54,7 +54,6 @@
#define C_ID "\x02""id"
#define C_IDENT "\x08""identity"
#define C_INCL "\x07""include"
#define C_IXFR_DIFF "\x15""ixfr-from-differences" /* obsolete */
#define C_JOURNAL_CONTENT "\x0F""journal-content"
#define C_JOURNAL_DB "\x0A""journal-db"
#define C_JOURNAL_DB_MODE "\x0F""journal-db-mode"
......
......@@ -394,14 +394,6 @@ int check_remote(
int check_template(
knotd_conf_check_args_t *args)
{
conf_val_t ixfr_diff = conf_rawid_get_txn(args->extra->conf, args->extra->txn,
C_TPL, C_IXFR_DIFF, args->id, args->id_len);
if (ixfr_diff.code == KNOT_EOK) {
CONF_LOG(LOG_NOTICE, "IXFR from differences setting is obsolete "
"and will be removed in the next major release, use "
"template.zonefile-load instead");
}
// Stop if the default template.
if (is_default_id(args->id, args->id_len)) {
return KNOT_EOK;
......@@ -431,14 +423,6 @@ int check_template(
int check_zone(
knotd_conf_check_args_t *args)
{
conf_val_t ixfr_diff = conf_rawid_get_txn(args->extra->conf, args->extra->txn,
C_ZONE, C_IXFR_DIFF, args->id, args->id_len);
if (ixfr_diff.code == KNOT_EOK) {
CONF_LOG(LOG_NOTICE, "IXFR from differences setting is obsolete "
"and will be removed in the next major release, use "
"zone.zonefile-load instead");
}
return KNOT_EOK;
}
......
......@@ -42,7 +42,8 @@ int event_load(conf_t *conf, zone_t *zone)
conf_val_t val = conf_zone_get(conf, C_JOURNAL_CONTENT, zone->name);
unsigned load_from = conf_opt(&val);
unsigned zf_from = conf_zonefile_load(conf, zone->name);
val = conf_zone_get(conf, C_ZONEFILE_LOAD, zone->name);
unsigned zf_from = conf_opt(&val);
int ret = KNOT_EOK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment