From: Peter van Dijk Date: Thu, 8 Dec 2022 08:04:55 +0000 (+0100) Subject: Merge pull request #12291 from Habbie/backport-12285-to-auth-4.7.x X-Git-Tag: auth-4.7.3~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a2c29243a69d7b4315cc5e4ecc91c857d4af70c;p=thirdparty%2Fpdns.git Merge pull request #12291 from Habbie/backport-12285-to-auth-4.7.x auth-4.7 api: do not create SOA and NS records for consumer zones --- 7a2c29243a69d7b4315cc5e4ecc91c857d4af70c diff --cc pdns/ws-auth.cc index 419cdc03c7,d2d0ab0153..8342d5af36 --- a/pdns/ws-auth.cc +++ b/pdns/ws-auth.cc @@@ -1705,9 -1704,18 +1705,9 @@@ static void apiServerZones(HttpRequest throw ApiException("You cannot give rrsets AND zone data as text"); auto nameservers = document["nameservers"]; - if (!nameservers.is_null() && !nameservers.is_array() && zonekind != DomainInfo::Slave) + if (!nameservers.is_null() && !nameservers.is_array() && zonekind != DomainInfo::Slave && zonekind != DomainInfo::Consumer) throw ApiException("Nameservers is not a list"); - string soa_edit_api_kind; - if (document["soa_edit_api"].is_string()) { - soa_edit_api_kind = document["soa_edit_api"].string_value(); - } - else { - soa_edit_api_kind = "DEFAULT"; - } - string soa_edit_kind = document["soa_edit"].string_value(); - // if records/comments are given, load and check them bool have_soa = false; bool have_zone_ns = false;