Commit 6935dab2 authored by Libor Peltan's avatar Libor Peltan Committed by Daniel Salzman

Revert "conf: warn if whole zonefile-load + automatic DNSSEC signing + ACL transfer"

This reverts commit 4fbcaf75.
parent 23669071
......@@ -31,7 +31,6 @@
#include "knot/conf/module.h"
#include "knot/conf/schema.h"
#include "knot/common/log.h"
#include "knot/updates/acl.h"
#include "libknot/errcode.h"
#include "libknot/yparser/yptrafo.h"
#include "contrib/string.h"
......@@ -424,39 +423,6 @@ int check_template(
int check_zone(
knotd_conf_check_args_t *args)
{
const knot_dname_t *zone = args->id;
// Check for dnssec_signing + zonefile_load whole + acl transfer.
conf_val_t dnssec = conf_zone_get_txn(args->extra->conf, args->extra->txn,
C_DNSSEC_SIGNING, zone);
conf_val_t zf_load = conf_zone_get_txn(args->extra->conf, args->extra->txn,
C_ZONEFILE_LOAD, zone);
if (conf_bool(&dnssec) && conf_opt(&zf_load) == ZONEFILE_LOAD_WHOLE) {
conf_val_t acl = conf_zone_get_txn(args->extra->conf, args->extra->txn,
C_ACL, zone);
bool stop = false;
while (acl.code == KNOT_EOK && !stop) {
conf_val_t action = conf_id_get_txn(args->extra->conf,
args->extra->txn,
C_ACL, C_ACTION, &acl);
while (action.code == KNOT_EOK) {
if (conf_opt(&action) != ACL_ACTION_TRANSFER) {
conf_val_next(&action);
continue;
}
CONF_LOG_ZONE(LOG_NOTICE, zone,
"zone file change with DNSSEC signing can "
"result in malformed outgoing IXFR, consider "
"zone.zonefile-load setting");
stop = true;
break;
}
conf_val_next(&acl);
}
}
return KNOT_EOK;
}
......
......@@ -938,15 +938,10 @@ static const yp_item_t desc_remote[] = {
{ NULL }
};
static const knot_lookup_t zonefile_load[] = {
{ 0, NULL }
};
#define ZONE_ITEMS \
{ C_FILE, YP_TSTR, YP_VNONE }, \
{ C_MASTER, YP_TREF, YP_VREF = { C_RMT }, YP_FMULTI, { check_ref } }, \
{ C_DNSSEC_SIGNING, YP_TBOOL, YP_VNONE }, \
{ C_ZONEFILE_LOAD, YP_TOPT, YP_VOPT = { zonefile_load, ZONEFILE_LOAD_WHOLE } }, \
{ C_COMMENT, YP_TSTR, YP_VNONE },
static const yp_item_t desc_template[] = {
......
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