Merge pull request #16971 from mind04/auth-nested-catalogs

Auth: nested catalogs

diff --cc docs/settings.rst
Simple merge

diff --cc modules/lmdbbackend/lmdbbackend.cc
Simple merge

diff --cc pdns/auth-main.cc
index 40892b2f78c2bb073d5b491dd334de3e58f915e4,37a3b74c170e190b9707cc5784d3b411f450b6da..862675307c339f0bcf1c2e2d405d7a0b37eb07f4
--- 1/pdns/auth-main.cc
--- 2/pdns/auth-main.cc
+++ b/pdns/auth-main.cc
@@@ -344,9 -342,8 +345,10 @@@ static void declareArguments(
    ::arg().setSwitch("consistent-backends", "Assume individual zones are not divided over backends. Send only ANY lookup operations to the backend to reduce the number of lookups") = "yes";
  
    ::arg().set("default-catalog-zone", "Catalog zone to assign newly created primary zones (via the API) to") = "";
+   ::arg().set("member-catalog-group", "Catalog group used to signal that a member zone is a catalog") = "pdns-member-catalog";
  
 +  ::arg().set("protobuf-servers", "Servers to send protobuf logging to");
 +
  #ifdef ENABLE_GSS_TSIG
    ::arg().setSwitch("enable-gss-tsig", "Enable GSS TSIG processing") = "no";
  #endif

diff --cc pdns/backends/gsql/gsqlbackend.cc
Simple merge

diff --cc pdns/pdnsutil.cc
Simple merge