Merge pull request #297 from Castaglia/codespell-nits

Correcting misspellings noted by `codespell`; these are cosmetic chan…

Author: Castaglia

doc/NOTES.dns-srv

@@ -34,7 +34,7 @@ Implementation:
 
   NOTE: Port numbers are NOT allowed in the URL if the SRV scheme is used!
     Why not?  Because port numbers are returned in the SRV records themselves;
-    avoid any possible collisions/conflicts.  Besides, mutiple SRV records
+    avoid any possible collisions/conflicts.  Besides, multiple SRV records
     for the same service name might have different ports.
 
     Similarly for TXT scheme; the port will be part of the URLs found in

doc/NOTES.health-checks

@@ -3,7 +3,7 @@ Health check (more properly "application server state" checks with applied
 interpretation/policy) metrics:
 
   TCP connect to port
-    conect timeout
+    connect timeout
     number of retries
     retry interval
 
@@ -22,7 +22,7 @@ interpretation/policy) metrics:
     retry interval
 
   FTP login
-    require succesful login (usually via anonymous login)
+    require successful login (usually via anonymous login)
     require specific response string?
     timeout
     number of retries
@@ -57,7 +57,7 @@ Notes:
 
   "RoundRobin is suitable where all available servers are assumed to be
    largely similar in functionality.  Weighed/ratio'd RoundRobin builds
-   weights into the system to deal with heterogenous capacity of the
+   weights into the system to deal with heterogeneous capacity of the
    servers.  (This is harder, since the "weight" factor is admin-assigned,
    and how exactly is it computed?  2x CPU?  4x memory?  6x network?)
 

include/proxy/ftp/msg.h

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy FTP message API
- * Copyright (c) 2013-2021 TJ Saunders
+ * Copyright (c) 2013-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,13 +27,13 @@
 
 #include "mod_proxy.h"
 
-/* Format a string containg the address for use in a PORT command or a
+/* Format a string containing the address for use in a PORT command or a
  * PASV response.
  */
 const char *proxy_ftp_msg_fmt_addr(pool *, const pr_netaddr_t *,
   unsigned short, int);
 
-/* Format a string containg the address for use in an EPRT command or an
+/* Format a string containing the address for use in an EPRT command or an
  * EPSV response.
  */
 const char *proxy_ftp_msg_fmt_ext_addr(pool *, const pr_netaddr_t *,

lib/proxy/ftp/ctrl.c

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy FTP control conn routines
- * Copyright (c) 2012-2023 TJ Saunders
+ * Copyright (c) 2012-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -183,7 +183,7 @@ pr_response_t *proxy_ftp_ctrl_recv_resp(pool *p, conn_t *ctrl_conn,
     }
 
     /* If we are the first line of the response, the first three characters
-     * MUST be numeric, followed by a hypen.  Anything else is nonconformant
+     * MUST be numeric, followed by a hyphen.  Anything else is nonconformant
      * with RFC 959.
      *
      * If we are NOT the first line of the response, then we are probably

lib/proxy/ssh/bcrypt.c

@@ -34,7 +34,7 @@
  * function with the following modifications:
  * 1. The input password and salt are preprocessed with SHA512.
  * 2. The output length is expanded to 256 bits.
- * 3. Subsequently the magic string to be encrypted is lengthened and modifed
+ * 3. Subsequently the magic string to be encrypted is lengthened and modified
  *    to "OxychromaticBlowfishSwatDynamite"
  * 4. The hash function is defined to perform 64 rounds of initial state
  *    expansion. (More rounds are performed by iterating the hash.)

lib/proxy/ssh/keys.c

@@ -3227,7 +3227,7 @@ static int deserialize_openssh_private_key(pool *p, const char *path,
   len = proxy_ssh_msg_read_int(p, data, data_len, &secret_keylen);
 
   /* NOTE: PuTTY's puttygen adds the public key _again_, in the second half
-   * of the secret key data, per commments in its
+   * of the secret key data, per comments in its
    * `sshecc.c#eddsa_new_priv_openssh` function.  Thus if this secret key
    * length is larger than expected for Ed448 keys, only use the first half of
    * it.  Ugh.  This "divide in half" hack only works for these keys where the

lib/proxy/tls.c

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy TLS implementation
- * Copyright (c) 2015-2024 TJ Saunders
+ * Copyright (c) 2015-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -934,7 +934,7 @@ static int cert_match_ip_san(pool *p, X509 *cert, const char *ipstr) {
           } else {
             if (san_datalen == 16) {
               /* We need to handle the case where the iPAddress SAN might
-               * have contained an IPv4-mapped IPv6 adress, and we're
+               * have contained an IPv4-mapped IPv6 address, and we're
                * comparing against an IPv4 address.
                */
               if (san_ipstrlen > 7 &&
@@ -1558,7 +1558,7 @@ static int tls_connect(conn_t *conn, const char *host_name,
   (void) pr_inet_set_proto_nodelay(conn->pool, conn, 0);
 
   if (nstrm->strm_type == PR_NETIO_STRM_DATA) {
-    /* Reenable TCP_CORK (aka TCP_NOPUSH), now that the handshake is done. */
+    /* Re-enable TCP_CORK (aka TCP_NOPUSH), now that the handshake is done. */
     if (pr_inet_set_proto_cork(conn->wfd, 1) < 0) {
       pr_trace_msg(trace_channel, 9,
         "error re-enabling TCP_CORK on data conn: %s", strerror(errno));

lib/proxy/uri.c

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy URI implementation
- * Copyright (c) 2012-2020 TJ Saunders
+ * Copyright (c) 2012-2025 TJ Saunders
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,7 +139,7 @@ static char *uri_parse_userinfo(pool *p, const char *orig_uri,
 
   /* To handle the case where the password field might itself contain an
    * '@' character, we first search from the end for '@'.  If found, then we
-   * search for '@' from the beginning.  If also found, AND if both ocurrences
+   * search for '@' from the beginning.  If also found, AND if both occurrences
    * are the same, then we have a plain "username:password@" string.
    *
    * Note that we can handle '@' characters within passwords (or usernames),

mod_proxy.c

@@ -4676,7 +4676,7 @@ static int proxy_get_cmd_group(cmd_rec *cmd) {
   }
 
   /* Note that some commands legitimately have no group (G_NONE is NULL), thus
-   * the absense of a group could simply indicate G_NONE.
+   * the absence of a group could simply indicate G_NONE.
    */
   if (cmd->group == NULL) {
     pr_trace_msg(trace_channel, 15,
@@ -4756,7 +4756,7 @@ MODRET proxy_any(cmd_rec *cmd) {
     return PR_DECLINED(cmd);
   }
 
-  /* Honor any <Limit> sections for this comand. */
+  /* Honor any <Limit> sections for this command. */
   if (proxy_have_limit(cmd, &resp_code) < 0) {
     int xerrno = errno;
 

mod_proxy.html

@@ -1590,7 +1590,7 @@ <h3><a name="ProxyTLSEngine">ProxyTLSEngine</a></h3>
     Use of SSL/TLS to the backend server will attempt to <em>match</em> the
     SSL/TLS usage of the frontend client.  Thus if the frontend client uses
     explicit FTPS, then explicit FTPS will be attempted with the backend;
-    similarly for implicit FTPS.  And if the frontent client does not use
+    similarly for implicit FTPS.  And if the frontend client does not use
     FTPS, then SSL/TLS will not be used for the backend connection.
   </li>
 </ul>
@@ -1629,7 +1629,7 @@ <h3><a name="ProxyTLSOptions">ProxyTLSOptions</a></h3>
   <li><code>EnableDiags</code>
     <p>
     Sets callbacks in the OpenSSL library such that <b>a lot</b> of
-    SSL/TLS protcol information is logged to the
+    SSL/TLS protocol information is logged to the
     <a href="#ProxyLog"><code>ProxyLog</code></a> file.  This option is
     <b>very</b> useful when debugging strange interactions with FTPS servers.
   </li>

t/api/db.c

@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy testsuite
- * Copyright (c) 2015-2022 TJ Saunders <[email protected]>
+ * Copyright (c) 2015-2025 TJ Saunders <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -202,7 +202,7 @@ START_TEST (db_open_with_version_test) {
     schema_name, schema_version, strerror(errno));
 
   res = proxy_db_close(p, dbh);
-  ck_assert_msg(res == 0, "Failed to close databas: %s", strerror(errno));
+  ck_assert_msg(res == 0, "Failed to close database: %s", strerror(errno));
 
   mark_point();
   schema_version = 99;

t/lib/ProFTPD/Tests/Modules/mod_proxy/tls.pm

@@ -1750,7 +1750,7 @@ sub proxy_reverse_backend_tls_login_cached_ticket {
   if (open(my $fh, ">> $config_file")) {
     print $fh <<EOC;
 <IfModule mod_tls.c>
-  # Recommended practice is to diable server-side session caching entirely,
+  # Recommended practice is to disable server-side session caching entirely,
   # if you are going to use client-side session tickets.  Why?  It
   # reduces the number of places where a session's master secret are held
   # in memory for "long" periods of time.

t/lib/ProFTPD/Tests/Modules/mod_proxy/tls/redis.pm

@@ -341,7 +341,7 @@ sub proxy_reverse_backend_tls_login_redis_cached_ticket {
   if (open(my $fh, ">> $config_file")) {
     print $fh <<EOC;
 <IfModule mod_tls.c>
-  # Recommended practice is to diable server-side session caching entirely,
+  # Recommended practice is to disable server-side session caching entirely,
   # if you are going to use client-side session tickets.  Why?  It
   # reduces the number of places where a session's master secret are held
   # in memory for "long" periods of time.