From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 4 Feb 2025 10:06:18 +0000 (+0100)
Subject: Process very initial review comments (docs and comments and trivial changes)
X-Git-Tag: dnsdist-2.0.0-alpha1~95^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=862b33b157d09992deb584db6da25da0ce9b61a2;p=thirdparty%2Fpdns.git

Process very initial review comments (docs and comments and trivial changes)
---

diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index ec17629a36..838f4ef913 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -918,7 +918,6 @@ nproxy
 NPTL
 NSes
 NSID
-nsid
 nsis
 nsrecord
 nsset
@@ -1500,7 +1499,6 @@ Viala
 viewcode
 visitedlinkcolor
 Vixie
-vixie
 vla
 Voegeli
 Volker
diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 0c2de94667..9718d44f9b 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2920,26 +2920,9 @@ static void recursorThread()
     }
 
     t_fdm = unique_ptr<FDMultiplexer>(getMultiplexer(log));
-#if 0
-    std::unique_ptr<RecursorWebServer> rws;
-#endif
     t_fdm->addReadFD(threadInfo.getPipes().readToThread, handlePipeRequest);
 
     if (threadInfo.isHandler()) {
-#if 0
-      if (::arg().mustDo("webserver")) {
-        SLOG(g_log << Logger::Warning << "Enabling web server" << endl,
-             log->info(Logr::Info, "Enabling web server"));
-        try {
-          rws = make_unique<RecursorWebServer>(t_fdm.get());
-        }
-        catch (const PDNSException& e) {
-          SLOG(g_log << Logger::Error << "Unable to start the internal web server: " << e.reason << endl,
-               log->error(Logr::Critical, e.reason, "Exception while starting internal web server"));
-          _exit(99);
-        }
-      }
-#endif
       SLOG(g_log << Logger::Info << "Enabled '" << t_fdm->getName() << "' multiplexer" << endl,
            log->info(Logr::Info, "Enabled multiplexer", "name", Logging::Loggable(t_fdm->getName())));
     }
diff --git a/pdns/recursordist/rec-rust-lib/cxxsupport.cc b/pdns/recursordist/rec-rust-lib/cxxsupport.cc
index bbc7f60dd1..89845cb26c 100644
--- a/pdns/recursordist/rec-rust-lib/cxxsupport.cc
+++ b/pdns/recursordist/rec-rust-lib/cxxsupport.cc
@@ -1480,8 +1480,6 @@ bool isValidHostname(::rust::Str str)
   }
 }
 
-void findBetterSolution(const std::unique_ptr<CredentialsHolder>& /* x */){};
-
 std::unique_ptr<ComboAddress> comboaddress(::rust::Str str)
 {
   return std::make_unique<ComboAddress>(::ComboAddress(std::string(str)));
diff --git a/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst b/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst
index 7723373f06..6802123ab0 100644
--- a/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst
+++ b/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst
@@ -537,7 +537,7 @@ For catalog zone members in a group, the forwarding parameters will be taken fro
 The forwarding definitions will be written into a file ``$api_dir/catzone.$zonename``. :ref:`setting-yaml-webservice.api_dir` must be defined, the directory must exist and be writable by the :program:`Recursor` process.
 
 IncomingWSConfig
-^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^
 As of version 5.3.0, an incoming web server configuration is defined as
 
 .. code-block:: yaml
@@ -562,7 +562,7 @@ A :ref:`setting-yaml-webservice.listen` section contains a sequence of `Incoming
 
 If no ``tls`` section is present, plaintext ``http`` connections are accepted on the listed addresses.
 
-If a ``tls`` section is present, clienst are required to use ``https`` to contact any of the address-port combinations listen in addresses. At the moment it is not possible to list additional properties of the TLS listener and encrypted key files cannot be used.
+If a ``tls`` section is present, clients are required to use ``https`` to contact any of the address-port combinations listen in addresses. At the moment it is not possible to list additional properties of the TLS listener and encrypted key files cannot be used.
 
 
 The YAML settings
diff --git a/pdns/recursordist/rec-rust-lib/rust/build.rs b/pdns/recursordist/rec-rust-lib/rust/build.rs
index 21eb063a8d..b2e9b952eb 100644
--- a/pdns/recursordist/rec-rust-lib/rust/build.rs
+++ b/pdns/recursordist/rec-rust-lib/rust/build.rs
@@ -7,7 +7,7 @@ fn main() {
         .flag("-I../../..")
         .compile("settings");
 
-    // lib.rs is genertated an take carte of by parent Makefile
+    // lib.rs is generated and take care of by parent Makefile
     println!("cargo:rerun-if-changed=src/misc.rs");
     println!("cargo:rerun-if-changed=src/web.rs");
 }