From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 8 Oct 2024 13:05:45 +0000 (+0200)
Subject: Detect faulty config (catz used but api-dir not set)
X-Git-Tag: rec-5.2.0-alpha1~7^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42691a09385970be891b8f9afd51fa8cd4274523;p=thirdparty%2Fpdns.git

Detect faulty config (catz used but api-dir not set)
---

diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc
index 55e51e69ed..7d752773ad 100644
--- a/pdns/recursordist/settings/cxxsupport.cc
+++ b/pdns/recursordist/settings/cxxsupport.cc
@@ -1427,6 +1427,10 @@ pdns::settings::rec::YamlSettingsStatus pdns::settings::rec::tryReadYAML(const s
            startupLog->info(Logr::Error, err, "configname", Logging::Loggable(yamlconfigname)));
       yamlstatus = pdns::settings::rec::PresentButFailed;
     }
+    else if (!settings.recursor.forwarding_catalog_zones.empty() && settings.webservice.api_dir.empty()) {
+      startupLog->info(Logr::Error, "Catalog zones defined, but webservice.api_dir is not set", "configname", Logging::Loggable(yamlconfigname));
+      yamlstatus = pdns::settings::rec::PresentButFailed;
+    }
     else if (setGlobals) {
       pdns::settings::rec::bridgeStructToOldStyleSettings(settings);
     }