From: Otto Moerbeek Date: Tue, 8 Oct 2024 13:21:24 +0000 (+0200) Subject: Reformat X-Git-Tag: rec-5.2.0-alpha1~7^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92d4b6ba435875a5f60b624f1fed3c2d7f8e5ffa;p=thirdparty%2Fpdns.git Reformat --- diff --git a/pdns/recursordist/rec-xfr.hh b/pdns/recursordist/rec-xfr.hh index 85fc125916..0dd49ebcb8 100644 --- a/pdns/recursordist/rec-xfr.hh +++ b/pdns/recursordist/rec-xfr.hh @@ -135,7 +135,6 @@ public: d_params(std::move(params)) {} - ZoneXFRParams d_params; // As there can be multiple threads doing updates (due to config reloads), we use a multimap. @@ -151,6 +150,7 @@ public: {} static void zoneXFRTracker(ZoneXFRParams params, uint64_t configGeneration); + private: void preloadZoneFile(const DNSName& zoneName, std::shared_ptr& oldZone, uint32_t& refresh, uint64_t configGeneration, ZoneWaiter& waiter, Logr::log_t logger); bool zoneTrackerIteration(const DNSName& zoneName, std::shared_ptr& oldZone, uint32_t& refresh, bool& skipRefreshDelay, uint64_t configGeneration, ZoneWaiter& waiter, Logr::log_t logger); diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc index 7d752773ad..b7183e2ef0 100644 --- a/pdns/recursordist/settings/cxxsupport.cc +++ b/pdns/recursordist/settings/cxxsupport.cc @@ -310,7 +310,7 @@ void pdns::settings::rec::processAPIDir(const string& includeDirOnCommandLine, p possiblyConvertForwardsandAuths(includeDir, apiDir, log); } -template +template static void addToAllowNotifyFor(Recursorsettings& settings, const rust::Vec& vec) { for (const auto& item : vec) {