summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/README.UPDATING6
-rwxr-xr-xsrc/scripts/Configure-os.h2
-rw-r--r--src/src/auths/gsasl_exim.c2
-rw-r--r--src/src/dane-openssl.c2
-rw-r--r--src/src/exim.c4
-rw-r--r--src/src/expand.c4
-rw-r--r--src/src/globals.h2
-rw-r--r--src/src/lookups/oracle.c2
-rw-r--r--src/src/malware.c2
-rw-r--r--src/src/rda.c2
-rw-r--r--src/src/readconf.c2
-rw-r--r--src/src/routers/accept.c2
-rw-r--r--src/src/routers/dnslookup.c2
-rw-r--r--src/src/routers/ipliteral.c2
-rw-r--r--src/src/routers/iplookup.c2
-rw-r--r--src/src/routers/manualroute.c2
-rw-r--r--src/src/spf.c2
-rw-r--r--src/src/tls-gnu.c4
-rw-r--r--src/src/transports/smtp.c4
19 files changed, 25 insertions, 25 deletions
diff --git a/src/README.UPDATING b/src/README.UPDATING
index 2438cc953..b619f5e03 100644
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -92,7 +92,7 @@ Exim version 4.83
-----------------
* SPF condition results renamed "permerror" and "temperror". The old
- names are still accepted for back-compatability, for this release.
+ names are still accepted for back-compatibility, for this release.
* TLS details are now logged on rejects, subject to log selectors.
@@ -133,7 +133,7 @@ Exim version 4.80
upgrading, then lock the message, replace the new-lines that should be part
of the -tls_peerdn line with the two-character sequence \n and then unlock
the message. No tool has been provided as we believe this is a rare
- occurence.
+ occurrence.
* For OpenSSL, SSLv2 is now disabled by default. (GnuTLS does not support
SSLv2). RFC 6176 prohibits SSLv2 and some informal surveys suggest no
@@ -346,7 +346,7 @@ Exim version 4.70
-----------------
1. Experimental Yahoo! Domainkeys support has been dropped in this release.
-It has been superceded by a native implementation of its successor DKIM.
+It has been superseded by a native implementation of its successor DKIM.
2. Up to version 4.69, Exim came with an embedded version of the PCRE library.
As of 4.70, this is no longer the case. To compile Exim, you will need PCRE
diff --git a/src/scripts/Configure-os.h b/src/scripts/Configure-os.h
index e9f6afd98..ae1ecf943 100755
--- a/src/scripts/Configure-os.h
+++ b/src/scripts/Configure-os.h
@@ -28,7 +28,7 @@ then echo ""
fi
rm -f os.h
-# In order to accomodate for the fudge below, copy the file instead of
+# In order to accommodate for the fudge below, copy the file instead of
# symlinking it. Otherwise we pollute the clean copy with the fudge.
cp -p ../OS/os.h-$os os.h || exit 1
diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index 26aa754d4..da833d5e7 100644
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -286,7 +286,7 @@ auth_gsasl_server(auth_instance *ablock, uschar *initial_data)
gsasl_property_set(sctx, GSASL_QOPS, "qop-auth");
#ifdef SUPPORT_TLS
if (tls_channelbinding_b64) {
- /* Some auth mechanisms can ensure that both sides are talking withing the
+ /* Some auth mechanisms can ensure that both sides are talking within the
same security context; for TLS, this means that even if a bad certificate
has been accepted, they remain MitM-proof because both sides must be within
the same negotiated session; if someone is terminating one session and
diff --git a/src/src/dane-openssl.c b/src/src/dane-openssl.c
index e6ab909a1..f7ccbd765 100644
--- a/src/src/dane-openssl.c
+++ b/src/src/dane-openssl.c
@@ -414,7 +414,7 @@ set_issuer_name(X509 *cert, AUTHORITY_KEYID *akid, X509_NAME *subj)
X509_NAME *name = akid_issuer_name(akid);
/*
- * If subject's akid specifies an authority key identifer issuer name, we
+ * If subject's akid specifies an authority key identifier issuer name, we
* must use that.
*/
return X509_set_issuer_name(cert,
diff --git a/src/src/exim.c b/src/src/exim.c
index 8ab11bb4e..f6f15f449 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2697,7 +2697,7 @@ for (i = 1; i < argc; i++)
#ifdef SUPPORT_TLS
/* -MCt: similar to -MCT below but the connection is still open
- via a proxy proces which handles the TLS context and coding.
+ via a proxy process which handles the TLS context and coding.
Require three arguments for the proxied local address and port,
and the TLS cipher. */
@@ -3656,7 +3656,7 @@ if (f.running_in_test_harness) smtputf8_advertise_hosts = NULL;
is a failure. It leaves the configuration file open so that the subsequent
configuration data for delivery can be read if needed.
-NOTE: immediatly after opening the configuration file we change the working
+NOTE: immediately after opening the configuration file we change the working
directory to "/"! Later we change to $spool_directory. We do it there, because
during readconf_main() some expansion takes place already. */
diff --git a/src/src/expand.c b/src/src/expand.c
index 2be7f9094..b2a921701 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -4814,7 +4814,7 @@ while (*s != 0)
(void)sscanf(CS now,"%u",&inow);
(void)sscanf(CS daystamp,"%u",&iexpire);
- /* When "iexpire" is < 7, a "flip" has occured.
+ /* When "iexpire" is < 7, a "flip" has occurred.
Adjust "inow" accordingly. */
if ( (iexpire < 7) && (inow >= 993) ) inow = 0;
@@ -7490,7 +7490,7 @@ while (*s != 0)
continue;
}
- /* Handle time period formating */
+ /* Handle time period formatting */
case EOP_TIME_EVAL:
{
diff --git a/src/src/globals.h b/src/src/globals.h
index c90783e3c..f71f104e2 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -490,7 +490,7 @@ extern BOOL disable_fsync; /* Not for normal use */
extern BOOL disable_ipv6; /* Don't do any IPv6 things */
#ifndef DISABLE_DKIM
-extern unsigned dkim_collect_input; /* Runtime count of dkim signtures; tracks wether SMTP input is fed to DKIM validation */
+extern unsigned dkim_collect_input; /* Runtime count of dkim signtures; tracks whether SMTP input is fed to DKIM validation */
extern uschar *dkim_cur_signer; /* Expansion variable, holds the current "signer" domain or identity during a acl_smtp_dkim run */
extern int dkim_key_length; /* Expansion variable, length of signing key in bits */
extern void *dkim_signatures; /* Actually a (pdkim_signature *) but most files do not need to know */
diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index bc14def70..1b21e6a6c 100644
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -415,7 +415,7 @@ while (cda->rc != NO_DATA_FOUND) /* Loop for each row */
result = string_catn(result, s, slen);
result = string_catn(result, US"=", 1);
- /* int and float type wont ever need escaping. Otherwise, quote the value
+ /* int and float type won't ever need escaping. Otherwise, quote the value
if it contains spaces or is empty. */
if (desc[i].dbtype != INT_TYPE && desc[i].dbtype != FLOAT_TYPE &&
diff --git a/src/src/malware.c b/src/src/malware.c
index 521c546f6..6adcf9b30 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1977,7 +1977,7 @@ b_seek: err = errno;
and the [ ] marker.
[+] - not infected
[L] - infected
- [E] - some error occured
+ [E] - some error occurred
Such marker follows the first non-escaped TAB. For more information
see avast-protocol(5)
diff --git a/src/src/rda.c b/src/src/rda.c
index 4131ac612..13f570928 100644
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -492,7 +492,7 @@ return TRUE;
/* This function is passed a forward list string (unexpanded) or the name of a
file (unexpanded) whose contents are the forwarding list. The list may in fact
be a filter program if it starts with "#Exim filter" or "#Sieve filter". Other
-types of filter, with different inital tag strings, may be introduced in due
+types of filter, with different initial tag strings, may be introduced in due
course.
The job of the function is to process the forwarding list or filter. It is
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 44452baa6..5742d10ae 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -966,7 +966,7 @@ for (;;)
/* Handle conditionals, which are also applied to physical lines. Conditions
are of the form ".ifdef ANYTEXT" and are treated as true if any macro
- expansion occured on the rest of the line. A preliminary test for the leading
+ expansion occurred on the rest of the line. A preliminary test for the leading
'.' saves effort on most lines. */
if (*ss == '.')
diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
index 65b6fb967..eb5b95511 100644
--- a/src/src/routers/accept.c
+++ b/src/src/routers/accept.c
@@ -117,7 +117,7 @@ DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rc = rf_get_errors_address(addr, rblock, verify, &errors_to);
if (rc != OK) return rc;
-/* Set up the additional and removeable headers for the address. */
+/* Set up the additional and removable headers for the address. */
rc = rf_get_munge_headers(addr, rblock, &extra_headers, &remove_headers);
if (rc != OK) return rc;
diff --git a/src/src/routers/dnslookup.c b/src/src/routers/dnslookup.c
index d6d7d0642..33939be4c 100644
--- a/src/src/routers/dnslookup.c
+++ b/src/src/routers/dnslookup.c
@@ -459,7 +459,7 @@ else if (ob->check_secondary_mx && !testflag(addr, af_local_host_removed))
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
-/* Set up the additional and removeable headers for this address. */
+/* Set up the additional and removable headers for this address. */
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);
diff --git a/src/src/routers/ipliteral.c b/src/src/routers/ipliteral.c
index 01eabb1dd..ecc604278 100644
--- a/src/src/routers/ipliteral.c
+++ b/src/src/routers/ipliteral.c
@@ -179,7 +179,7 @@ addr->host_list = h;
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
-/* Set up the additional and removeable headers for this address. */
+/* Set up the additional and removable headers for this address. */
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);
diff --git a/src/src/routers/iplookup.c b/src/src/routers/iplookup.c
index bc58a1f82..ff67af38d 100644
--- a/src/src/routers/iplookup.c
+++ b/src/src/routers/iplookup.c
@@ -404,7 +404,7 @@ addr->child_count++;
new_addr->next = *addr_new;
*addr_new = new_addr;
-/* Set up the errors address, if any, and the additional and removeable headers
+/* Set up the errors address, if any, and the additional and removable headers
for this new address. */
rc = rf_get_errors_address(addr, rblock, verify, &new_addr->prop.errors_address);
diff --git a/src/src/routers/manualroute.c b/src/src/routers/manualroute.c
index 301ec80e4..7389a9921 100644
--- a/src/src/routers/manualroute.c
+++ b/src/src/routers/manualroute.c
@@ -380,7 +380,7 @@ while (*options)
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
-/* Set up the additional and removeable headers for this address. */
+/* Set up the additional and removable headers for this address. */
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);
diff --git a/src/src/spf.c b/src/src/spf.c
index a203c07ba..0b00a5c7c 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -103,7 +103,7 @@ if (!(spf_server && spf_request))
rc = SPF_RESULT_PERMERROR;
else if (SPF_request_set_env_from(spf_request, CS spf_envelope_sender))
- /* Invalid sender address. This should be a real rare occurence */
+ /* Invalid sender address. This should be a real rare occurrence */
rc = SPF_RESULT_PERMERROR;
else
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 42d54a9c5..bceb57395 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -1304,7 +1304,7 @@ if (!exim_gnutls_base_init_done)
DEBUG(D_tls)
{
gnutls_global_set_log_function(exim_gnutls_logger_cb);
- /* arbitrarily chosen level; bump upto 9 for more */
+ /* arbitrarily chosen level; bump up to 9 for more */
gnutls_global_set_log_level(EXIM_GNUTLS_LIBRARY_LOG_LEVEL);
}
#endif
@@ -2641,7 +2641,7 @@ Only used by the server-side TLS.
This feeds DKIM and should be used for all message-body reads.
-Arguments: lim Maximum amount to read/bufffer
+Arguments: lim Maximum amount to read/buffer
Returns: the next character or EOF
*/
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 39d75d3bd..c624c4f0c 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2983,7 +2983,7 @@ Or just forget about lines? Or inflate by a fixed proportion? */
}
#ifndef DISABLE_PRDR
-/* If it supports Per-Recipient Data Reponses, and we have omre than one recipient,
+/* If it supports Per-Recipient Data Responses, and we have more than one recipient,
request that */
sx->prdr_active = FALSE;
@@ -4117,7 +4117,7 @@ connection if there are several waiting, provided we haven't already sent so
many as to hit the configured limit. The function transport_check_waiting looks
for a waiting message and returns its id. Then transport_pass_socket tries to
set up a continued delivery by passing the socket on to another process. The
-variable send_rset is FALSE if a message has just been successfully transfered.
+variable send_rset is FALSE if a message has just been successfully transferred.
If we are already sending down a continued channel, there may be further
addresses not yet delivered that are aimed at the same host, but which have not
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 07:28:24 +0000