From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 19 Nov 2025 18:44:50 +0000 (-0500) Subject: spelling: an X-Git-Tag: rec-5.4.0-alpha1~61^2~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efaf83fff8b178dc5b62dca8a455f6d80f75b060;p=thirdparty%2Fpdns.git spelling: an Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 6fb24c9242..f9f1e2ed82 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -241,7 +241,7 @@ jobs: run: | for tag in `echo "${INPUT_IMAGE_TAGS}" | tr '\n' ' '`; do echo 'Testing: '${IMAGE_NAME}':'${tag}; - # recent pdns-auth images of tags older than 4.9.x image return a exit code 99 + # recent pdns-auth images of tags older than 4.9.x image return an exit code 99 docker run ${IMAGE_NAME}:${tag} --version || [ "$?" == "99" ] done - name: Check image digest matches diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 1500c64d7b..baad58721e 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -11,7 +11,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo jobs: build: name: Verify source code formatting; check Makefile.am sort order - # on a ubuntu-24.04 VM + # on an ubuntu-24.04 VM runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/secpoll.yml b/.github/workflows/secpoll.yml index b996db22a9..9854a088b5 100644 --- a/.github/workflows/secpoll.yml +++ b/.github/workflows/secpoll.yml @@ -11,7 +11,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo jobs: build: name: check secpoll zone - # on a ubuntu-24.04 VM + # on an ubuntu-24.04 VM runs-on: ubuntu-24.04 steps: - uses: PowerDNS/pdns/set-ubuntu-mirror@meta diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index a57063b7a0..9febe5a079 100644 --- a/CODING_GUIDELINES.md +++ b/CODING_GUIDELINES.md @@ -68,7 +68,7 @@ It means that if an object is correctly designed, the resources associated with Since stack-allocated objects, like local variables in a function, are automatically destroyed when a function exits, be it by reaching the last line, calling return or throwing an exception, it makes it possible to ensure that resources are always properly destroyed by wrapping them in an object. We describe the use of smart pointers, containers and other wrappers for that purpose below, but first a few words of caution. -Resources stored in a object are only tied to this object if the constructor executes fully and completes properly. +Resources stored in an object are only tied to this object if the constructor executes fully and completes properly. If an exception is raised in the constructor's body, the object is not created and therefore the destructor will not be called. This means that if the object has non-object members holding resources, like raw file descriptors or raw C-style pointers, they need to be explicitly released before raising the exception; otherwise, they are lost or leaked. diff --git a/docs/backends/generic-sql.rst b/docs/backends/generic-sql.rst index c2cea298ee..f84f3dec66 100644 --- a/docs/backends/generic-sql.rst +++ b/docs/backends/generic-sql.rst @@ -351,8 +351,8 @@ On secondaries On autoprimary ~~~~~~~~~~~~~~ -- ``autoprimary-query``: Called to determine if a certain host is a autoprimary for a certain domain name. -- ``autoprimary-name-to-ips``: Called to the IP and account for a autoprimary. +- ``autoprimary-query``: Called to determine if a certain host is an autoprimary for a certain domain name. +- ``autoprimary-name-to-ips``: Called to the IP and account for an autoprimary. TSIG ^^^^ diff --git a/docs/backends/lua2.rst b/docs/backends/lua2.rst index a35b91605f..00a14729e5 100644 --- a/docs/backends/lua2.rst +++ b/docs/backends/lua2.rst @@ -54,7 +54,7 @@ INPUT: - table ctx - Query context table, contains ``source_address`` and ``real_source_address``. OUTPUT: - Expects a array which has tables with following keys: + Expects an array which has tables with following keys: - DNSName name - resource record name (can also be string) - string type - type of resource record (can also be QType or valid integer) diff --git a/docs/manpages/pdnsutil.1.rst b/docs/manpages/pdnsutil.1.rst index deeec130bd..6d9efe6bc7 100644 --- a/docs/manpages/pdnsutil.1.rst +++ b/docs/manpages/pdnsutil.1.rst @@ -37,7 +37,7 @@ AUTOPRIMARY COMMANDS autoprimary add *IP* *NAMESERVER* [*ACCOUNT*] - Add a autoprimary entry into the backend. This enables receiving zone + Add an autoprimary entry into the backend. This enables receiving zone updates from other servers. autoprimary list diff --git a/docs/modes-of-operation.rst b/docs/modes-of-operation.rst index b2b6f57b49..f32b08691d 100644 --- a/docs/modes-of-operation.rst +++ b/docs/modes-of-operation.rst @@ -263,7 +263,7 @@ of NS records remotely, and the 'account' name of your autoprimary. There is no need to fill the account name out but it does help keep track of where a domain comes from. Additionally, if a secondary selects multiple autoprimaries for a zone based on the name of the primary, it also checks that the ``account`` field is the same for all. -Adding a autoprimary can be done either directly in the database, +Adding an autoprimary can be done either directly in the database, or by using the ``pdnsutil autoprimary add`` command (``pdnsutil add-autoprimary`` prior to version 5.0). diff --git a/modules/geoipbackend/regression-tests/apex-record/description b/modules/geoipbackend/regression-tests/apex-record/description index b1ecc211c9..4d07b939a2 100644 --- a/modules/geoipbackend/regression-tests/apex-record/description +++ b/modules/geoipbackend/regression-tests/apex-record/description @@ -1 +1 @@ -This test checks that you can have a apex record as both service record and static record. +This test checks that you can have an apex record as both service record and static record. diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index b103fb64ba..f4b371c5f9 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -77,7 +77,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "http:url=http://localhost:62434/dns"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index 88f7c183d9..5dc7a7f323 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -75,7 +75,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "http:url=http://localhost:62434/dns/endpoint.json,post=1,post_json=1"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index 5687fd6a55..f09df99ac7 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -75,7 +75,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "pipe:command=unittest_pipe.py"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index 3db16dfddd..b1f55f6047 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -75,7 +75,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "http:url=http://localhost:62434/dns,post=1"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index b9f6067a76..29c48ee5af 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -75,7 +75,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "unix:path=/tmp/remotebackend.sock"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc index df5bd69ca2..01f43b3945 100644 --- a/modules/remotebackend/test-remotebackend-zeromq.cc +++ b/modules/remotebackend/test-remotebackend-zeromq.cc @@ -77,7 +77,7 @@ struct RemotebackendSetup ::arg().set("module-dir") = "./.libs"; auto loader = std::make_unique(); BackendMakers().launch("remote"); - // then get us a instance of it + // then get us an instance of it ::arg().set("remote-connection-string") = "zeromq:endpoint=ipc:///tmp/remotebackend.0"; ::arg().set("remote-dnssec") = "yes"; backendUnderTest = std::move(BackendMakers().all()[0]); diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index 120d216bd3..5826b318c4 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -1697,7 +1697,7 @@ bool GSQLBackend::autoPrimaryBackend(const string& ipAddress, const ZoneName& do // clang-format on } catch (SSqlException &e) { - throw PDNSException("GSQLBackend unable to search for a autoprimary with IP " + ipAddress + " and nameserver name '" + i.content + "' for domain '" + domain.toLogString() + "': " + e.txtReason()); + throw PDNSException("GSQLBackend unable to search for an autoprimary with IP " + ipAddress + " and nameserver name '" + i.content + "' for domain '" + domain.toLogString() + "': " + e.txtReason()); } if(!d_result.empty()) { ASSERT_ROW_COLUMNS("autoprimary-query", d_result[0], 1); diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh index 999559f8ba..66d3745177 100644 --- a/pdns/dnsbackend.hh +++ b/pdns/dnsbackend.hh @@ -441,7 +441,7 @@ public: return false; } - //! determine if ip is a autoprimary or a domain + //! determine if ip is an autoprimary or a domain virtual bool autoPrimaryBackend(const string& /* ip */, const ZoneName& /* domain */, const vector& /* nsset */, string* /* nameserver */, string* /* account */, DNSBackend** /* db */) { return false; @@ -453,7 +453,7 @@ public: return false; } - //! called by PowerDNS to create a secondary record for a autoPrimary + //! called by PowerDNS to create a secondary record for an autoPrimary virtual bool createSecondaryDomain(const string& /* ip */, const ZoneName& /* domain */, const string& /* nameserver */, const string& /* account */) { return false; diff --git a/pdns/dnsdistdist/dnsdist-idstate.hh b/pdns/dnsdistdist/dnsdist-idstate.hh index 25ecbb36c1..eaa9975f97 100644 --- a/pdns/dnsdistdist/dnsdist-idstate.hh +++ b/pdns/dnsdistdist/dnsdist-idstate.hh @@ -302,7 +302,7 @@ struct IDState mostly to keep some counters like the 'outstanding' one sane. We have two flags: - - inUse tells us if there currently is a in-flight query whose state is stored + - inUse tells us if there currently is an in-flight query whose state is stored in this state - locked tells us whether someone currently owns the state, so no-one else can touch it diff --git a/pdns/dnsdistdist/dnsdist-snmp.cc b/pdns/dnsdistdist/dnsdist-snmp.cc index d870e0b0cd..72d67794fe 100644 --- a/pdns/dnsdistdist/dnsdist-snmp.cc +++ b/pdns/dnsdistdist/dnsdist-snmp.cc @@ -72,7 +72,7 @@ static std::unordered_map s_statsMap; /* We are never called for a GETNEXT if it's registered as a "instance", as it's "magically" handled for us. */ -/* a instance handler also only hands us one request at a time, so +/* an instance handler also only hands us one request at a time, so we don't need to loop over a list of requests; we'll only get one. */ static int handleCounter64Stats(netsnmp_mib_handler* handler, diff --git a/pdns/dnsdistdist/docs/changelog.rst b/pdns/dnsdistdist/docs/changelog.rst index 6baa4217f7..60630fea56 100644 --- a/pdns/dnsdistdist/docs/changelog.rst +++ b/pdns/dnsdistdist/docs/changelog.rst @@ -3213,7 +3213,7 @@ Changelog :pullreq: 11621 :tickets: 11604 - Fix a crash on a invalid protocol in DoH forwarded-for header + Fix a crash on an invalid protocol in DoH forwarded-for header .. change:: :tags: Bug Fixes @@ -3525,7 +3525,7 @@ Changelog :pullreq: 11667 :tickets: 11621 - Fix a crash on a invalid protocol in DoH forwarded-for header + Fix a crash on an invalid protocol in DoH forwarded-for header .. changelog:: :version: 1.7.1 diff --git a/pdns/dnsdistdist/docs/guides/downstreams.rst b/pdns/dnsdistdist/docs/guides/downstreams.rst index ffa2717122..8e385c7edf 100644 --- a/pdns/dnsdistdist/docs/guides/downstreams.rst +++ b/pdns/dnsdistdist/docs/guides/downstreams.rst @@ -83,7 +83,7 @@ Since 1.8.0, dnsdist implements a ``lazy`` mode that can be set via the ``health :align: center :alt: DNSDist Lazy health checks -The threshold of failed regular queries is configured via ``lazyHealthCheckThreshold``, indicating of percentage of regular queries that should have resulted in a failure over the last recent queries. Only the results of the last ``lazyHealthCheckSampleSize`` queries will be considered, as the results are kept in a in-memory circular buffer. The results of at least ``lazyHealthCheckMinSampleCount`` queries should be present for the threshold to be considered meaningful, to avoid an issue with a too small sample. +The threshold of failed regular queries is configured via ``lazyHealthCheckThreshold``, indicating of percentage of regular queries that should have resulted in a failure over the last recent queries. Only the results of the last ``lazyHealthCheckSampleSize`` queries will be considered, as the results are kept in an in-memory circular buffer. The results of at least ``lazyHealthCheckMinSampleCount`` queries should be present for the threshold to be considered meaningful, to avoid an issue with a too small sample. By default both queries that resulted in a timeout and those that received a ``ServFail`` answer are considered failures, but it is possible to set ``lazyHealthCheckMode`` to ``TimeoutOnly`` so that only timeouts are considered failures. diff --git a/pdns/dnsdistdist/docs/guides/webserver.rst b/pdns/dnsdistdist/docs/guides/webserver.rst index 6b3447cfca..f2bcc9e848 100755 --- a/pdns/dnsdistdist/docs/guides/webserver.rst +++ b/pdns/dnsdistdist/docs/guides/webserver.rst @@ -929,7 +929,7 @@ JSON Objects :property integer tlsHandshakeFailuresUnknownKeyExchangeType: Amount of TLS connections where the client has tried to negotiate an unknown TLS key-exchange mechanism :property integer tlsHandshakeFailuresUnknownProtocol: Amount of TLS connections where the client has tried to negotiate an unknown TLS version :property integer tlsHandshakeFailuresUnsupportedEC: Amount of TLS connections where the client has tried to negotiate an unsupported elliptic curve - :property integer tlsHandshakeFailuresUnsupportedProtocol: Amount of TLS connections where the client has tried to negotiate a unsupported TLS version + :property integer tlsHandshakeFailuresUnsupportedProtocol: Amount of TLS connections where the client has tried to negotiate an unsupported TLS version :property integer tlsInactiveTicketKey: Amount of TLS sessions resumed from an inactive key :property integer tlsNewSessions: Amount of new TLS sessions negotiated :property integer tlsResumptions: Amount of TLS sessions resumed diff --git a/pdns/dnsdistdist/docs/reference/logging.rst b/pdns/dnsdistdist/docs/reference/logging.rst index c4b0c0a794..f6713bcae3 100755 --- a/pdns/dnsdistdist/docs/reference/logging.rst +++ b/pdns/dnsdistdist/docs/reference/logging.rst @@ -5,7 +5,7 @@ There are some functions to create log output. .. function:: errlog(line) - Writes a error line. + Writes an error line. :param str line: The line to write. diff --git a/pdns/dnsdistdist/test-dnsdistserverpool.cc b/pdns/dnsdistdist/test-dnsdistserverpool.cc index 07c4ad472b..f9370adacf 100644 --- a/pdns/dnsdistdist/test-dnsdistserverpool.cc +++ b/pdns/dnsdistdist/test-dnsdistserverpool.cc @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(test_ServerPoolECSConsistency) BOOST_CHECK(!pool.isTCPOnly()); BOOST_CHECK(!pool.isConsistent()); /* the pool was in a consistent state without ECS, - and now is in a inconsistent state so it not automatically + and now is in an inconsistent state so it not automatically updated */ BOOST_CHECK(!pool.getECS()); } diff --git a/pdns/lock.hh b/pdns/lock.hh index 13e28d5aaf..d04e4d1b8d 100644 --- a/pdns/lock.hh +++ b/pdns/lock.hh @@ -65,7 +65,7 @@ - ReadLock, WriteLock, TryReadLock and TryWriteLock are there as RAII objects allowing to take a lock and be sure that it will always be unlocked - when we exit the block, even with a unforeseen exception. + when we exit the block, even with an unforeseen exception. They are light wrappers around std::unique_lock and std::shared_lock since C++17. diff --git a/pdns/recursordist/docs/changelog/4.6.rst b/pdns/recursordist/docs/changelog/4.6.rst index 3629c0e265..ac63db846e 100644 --- a/pdns/recursordist/docs/changelog/4.6.rst +++ b/pdns/recursordist/docs/changelog/4.6.rst @@ -156,7 +156,7 @@ Changelogs for 4.6.X :pullreq: 11359 :tickets: 11257 - Initialize isNew before calling a exception throwing function. + Initialize isNew before calling an exception throwing function. .. change:: :tags: Improvements diff --git a/pdns/recursordist/docs/security-advisories/powerdns-advisory-2023-01.rst b/pdns/recursordist/docs/security-advisories/powerdns-advisory-2023-01.rst index eba0c3189e..2b8ca83323 100644 --- a/pdns/recursordist/docs/security-advisories/powerdns-advisory-2023-01.rst +++ b/pdns/recursordist/docs/security-advisories/powerdns-advisory-2023-01.rst @@ -13,7 +13,7 @@ PowerDNS Security Advisory 2023-01: unbounded recursion results in program termi An issue in the processing of queries for misconfigured domains has been found in PowerDNS Recursor 4.8.0, allowing a remote attacker to crash the recursor by sending a DNS query for one of these -domains. The issue happens because the recursor enters a unbounded loop, exceeding its stack +domains. The issue happens because the recursor enters an unbounded loop, exceeding its stack memory. Because of the specific way in which this issue happens, we do not believe this issue to be exploitable for code execution. diff --git a/pdns/recursordist/negcache.cc b/pdns/recursordist/negcache.cc index 7d4f45f532..05be66a04f 100644 --- a/pdns/recursordist/negcache.cc +++ b/pdns/recursordist/negcache.cc @@ -72,7 +72,7 @@ bool NegCache::getRootNXTrust(const DNSName& qname, const struct timeval& now, N void NegCache::updateStaleEntry(time_t now, negcache_t::iterator& entry, QType qtype) { - // We need to take care a infrequently access stale item cannot be extended past + // We need to take care an infrequently access stale item cannot be extended past // s_maxServedStaleExtension * s_serveStaleExtensionPeriod // We we look how old the entry is, and increase d_servedStale accordingly, taking care not to overflow const time_t howlong = std::max(static_cast(1), now - entry->d_ttd); diff --git a/pdns/recursordist/rec-eventtrace.hh b/pdns/recursordist/rec-eventtrace.hh index 34fe36067d..f6373172bf 100644 --- a/pdns/recursordist/rec-eventtrace.hh +++ b/pdns/recursordist/rec-eventtrace.hh @@ -342,7 +342,7 @@ public: ~EventScope() { // If the dt is called after an explicit close(), value does not matter. - // Otherwise, it signals a implicit close, e.g. an exception was thrown + // Otherwise, it signals an implicit close, e.g. an exception was thrown close(-1); } EventScope(const EventScope&) = delete; diff --git a/pdns/recursordist/rec-rust-lib/README.md b/pdns/recursordist/rec-rust-lib/README.md index ca103be28f..209e232418 100644 --- a/pdns/recursordist/rec-rust-lib/README.md +++ b/pdns/recursordist/rec-rust-lib/README.md @@ -168,7 +168,7 @@ void pdns::settings::rec::bridgeStructToOldStyleSettings(const Recursorsettings& ... ``` -Lastly, there is code to support converting a old-style settings to a new-style struct found in `pdns::settings::rec::oldKVToBridgeStruct()`. +Lastly, there is code to support converting an old-style settings to a new-style struct found in `pdns::settings::rec::oldKVToBridgeStruct()`. This code is used to convert old style settings files to YAML (used by `rec_control show-yaml`) and to generate a yaml file with all the defaults values (used by `pdns_recursor --config=default`). The functions implementing that are `pdns::settings::rec::oldStyleSettingsFileToYaml` and `std::string pdns::settings::rec::defaultsToYaml()`, found in `cxxsupport.cc`. 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 7a4c3b139d..fb8b1344ee 100644 --- a/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst +++ b/pdns/recursordist/rec-rust-lib/docs-new-preamble-in.rst @@ -14,7 +14,7 @@ Settings on the command line are processed after the file-based settings are pro Starting with version 5.1.0, in the absence of a ``recursor.yml`` file, an existing ``recursor.conf`` will be processed as YAML, if that fails, it will be processed as old-style configuration. - Packages will stop installing a old-style ``recursor.conf`` file and start installing a default ``recursor.conf`` file containing YAML syntax. + Packages will stop installing an old-style ``recursor.conf`` file and start installing a default ``recursor.conf`` file containing YAML syntax. With the release of 5.2.0, the default will be to expect a YAML configuration file and reading of old-style ``recursor.conf`` files will have to be enabled specifically by providing a command line option ``--enable-old-settings``. diff --git a/pdns/recursordist/rec-rust-lib/rust-bridge-in.rs b/pdns/recursordist/rec-rust-lib/rust-bridge-in.rs index bb7c10eb8a..d7c3bd86dd 100644 --- a/pdns/recursordist/rec-rust-lib/rust-bridge-in.rs +++ b/pdns/recursordist/rec-rust-lib/rust-bridge-in.rs @@ -428,7 +428,7 @@ extern "Rust" { fn allow_from_to_yaml_string_incoming(key: &String, filekey: &String, vec: &Vec) -> Result; fn allow_for_to_yaml_string(vec: &Vec) -> Result; - // Merge a string representing YAML settings into a existing setttings struct + // Merge a string representing YAML settings into an existing setttings struct fn merge(lhs: &mut Recursorsettings, rhs: &str) -> Result<()>; // Validate the sections inside the main settings struct, sections themselves will validate their fields diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py index b0566530fe..e8a97ec941 100644 --- a/pdns/recursordist/rec-rust-lib/table.py +++ b/pdns/recursordist/rec-rust-lib/table.py @@ -2201,7 +2201,7 @@ The dnsdist docs have `more information about the PROXY protocol s_statsMap; /* We are never called for a GETNEXT if it's registered as a "instance", as it's "magically" handled for us. */ -/* a instance handler also only hands us one request at a time, so +/* an instance handler also only hands us one request at a time, so we don't need to loop over a list of requests; we'll only get one. */ static int handleCounter64Stats(netsnmp_mib_handler* /* handler */, diff --git a/pdns/recursordist/rec-system-resolve.cc b/pdns/recursordist/rec-system-resolve.cc index 8a473d4072..99ef7d1285 100644 --- a/pdns/recursordist/rec-system-resolve.cc +++ b/pdns/recursordist/rec-system-resolve.cc @@ -80,7 +80,7 @@ PacketBuffer resolve(const string& name, QClass cls, QType type) return answer; } -// do a id.server/CH/TXT query +// do an id.server/CH/TXT query std::string serverID() { auto buffer = resolve("id.server", QClass::CHAOS, QType::TXT); diff --git a/pdns/recursordist/recursor_cache.cc b/pdns/recursordist/recursor_cache.cc index 5e2f5d7466..b665f0b4bd 100644 --- a/pdns/recursordist/recursor_cache.cc +++ b/pdns/recursordist/recursor_cache.cc @@ -292,7 +292,7 @@ static void pushRefreshTask(const DNSName& qname, QType qtype, time_t deadline, void MemRecursorCache::updateStaleEntry(time_t now, MemRecursorCache::OrderedTagIterator_t& entry) { - // We need to take care a infrequently access stale item cannot be extended past + // We need to take care an infrequently access stale item cannot be extended past // s_maxServedStaleExtension * s_serveStaleExtensionPeriod // We look how old the entry is, and increase d_servedStale accordingly, taking care not to overflow const time_t howlong = std::max(static_cast(1), now - entry->d_ttd); diff --git a/pdns/recursordist/test-aggressive_nsec_cc.cc b/pdns/recursordist/test-aggressive_nsec_cc.cc index 900d65b62b..42f21f7c00 100644 --- a/pdns/recursordist/test-aggressive_nsec_cc.cc +++ b/pdns/recursordist/test-aggressive_nsec_cc.cc @@ -1211,7 +1211,7 @@ BOOST_AUTO_TEST_CASE(test_aggressive_nsec_pruning) BOOST_CHECK_EQUAL(cache->getEntriesCount(), 3U); - /* we have set a upper bound to 2 entries, so we are above, + /* we have set an upper bound to 2 entries, so we are above, and one entry is actually expired, so we will prune one entry to get below the limit */ cache->prune(now.tv_sec + 15); diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc index d0df66ccdd..d7bd571862 100644 --- a/pdns/rfc2136handler.cc +++ b/pdns/rfc2136handler.cc @@ -229,7 +229,7 @@ static uint performInsert(const DNSRecord* rr, updateContext& ctx, vector