1. You can define the sender host addresses from which you will scan the spam.
In my example there are ABC.DEF.GHI.JKL and MNO.PQR.STU.VWX (you have to
-substiute this by your real IP-Adresses).
+substiute this by your real IP addresses).
2. The spamcheck router only runs in dependency of the existence of the
-.spamcheck file. So your users can decide whether or not they wont to use
-Spamassassin. Thats important for protection of privacy in germany.
+.spamcheck file. So your users can decide whether or not they want to use
+Spamassassin. That's important for protection of privacy in Germany.
If you don't need this you can simplify the router, for example:
Put the router and the transport on the right places in your exim conf and send
-the daemon a HUP signal. Thats all.
+the daemon a HUP signal. That's all.
- oliver
driver = redirect
address_data = GET_ADDRESS_DATA
# data is intentionally left blank so that the router will decline
- # we just want this router to do a lookup so the results are availble
+ # we just want this router to do a lookup so the results are available
# for the other routers.
data =
driver = smtp
# Deliver to the mailbox specified in the LDAP directory. We make sure
-# that quota is obeyed, and we try to send a messge to the user if it
+# that quota is obeyed, and we try to send a message to the user if it
# gets to over 85%.
local_delivery:
# headers to world-unique values.
# Notes:
-# Change every occurence of "home.dom" to your home domain.
-# Change every occurence of "uniqie.remote.dom" to some unique value.
+# Change every occurrence of "home.dom" to your home domain.
+# Change every occurrence of "uniqie.remote.dom" to some unique value.
# Unique values, as Vadik explained in his message to exim-users,
# can be chosen in different ways:
### The ideal way is to choose "hostnames" in existing domains whose
### admins you know, and you will be sure that no hostname ending
-### with ".nonexistant.friendly.dom" will ever appear on this planet,
+### with ".nonexistent.friendly.dom" will ever appear on this planet,
### not even on someone else's message IDs.
### Another ideas include putting after your hostname things like:
# Generate all the documentation files...
#
## removed info files as I cannot generate them - spec.info filter.info
-## removed html files as superceded by new website code
+## removed html files as superseded by new website code
everything: spec.pdf spec.ps spec.txt \
filter.pdf filter.ps filter.txt \
exim.8
Locking in the traditional UNIX formats was largely dictated by
the status quo in other applications; however, additional protection
-is added against inadvertantly running multiple instances of a
+is added against inadvertently running multiple instances of a
c-client application on the same mail file.
(1) c-client attempts to create a .lock file (mail file name with
a temporary error. Here are some possibilities:
(1) The messages to \(aol.com)\ got put in your queue, but no previous
- delivery attempt occured before you did the \-R-\. This might have been
+ delivery attempt occurred before you did the \-R-\. This might have been
because of your settings of \queue_only_load\, \smtp_accept_queue\, or any
other option that caused no immediate delivery attempt on arrival. If
this is the case, you can try using \-qqR-\ instead of \-R-\.
taken from Exim's change log:
When Exim is receiving multiple messages on a single connection, and
- spinning off delivery processess, it sets the SIGCHLD signal handling to
+ spinning off delivery processes, it sets the SIGCHLD signal handling to
SIG_IGN, because it doesn't want to wait for these processes. However,
because on some OS this didn't work, it also has a paranoid call to
\^waitpid()^\ in the loop to reap any children that have finished. Some
any more. How can I arrange to delete any mail that is sent to them?
A0419: To reject them at SMTP time, with a customized error message, place
- statments like this in the ACL:
+ statements like this in the ACL:
==> deny message = The domain $domain is obsolete
domains = lsearch;/etc/exim/obsolete.domains
up earlier on some types of file system, compared with others.
Exim was not designed for handling large queues. If you are in an
- enviroment where lots of messages remain on the queue for long periods
+ environment where lots of messages remain on the queue for long periods
of time, consider implementing a back up host to which you pass these
messages, so that the main host's queue remains short. You can use
\fallback_hosts\ to do this, or a router that is conditional on
land for Majordomo at the same time.
A9604: The problem appears to be the number of open files the system can
- handle. This is changable by using the proc filesystem. To your
+ handle. This is changeable by using the proc filesystem. To your
\(/etc/rc.d/rc.local)\ file append something like the following:
==> # Now System is up, Modify kernel parameters for max open etc.
longest line that was received as part of the message, not counting the
line termination character(s).
- 7. Host lists can now include +ignore_defer and +include_defer, analagous to
+ 7. Host lists can now include +ignore_defer and +include_defer, analogous to
+ignore_unknown and +include_unknown. These options should be used with
care, probably only in non-critical host lists such as whitelists.
Berkeley DB 4.x
---------------
-The 4.x series is a developement of the 2.x and 3.x series, and the above
+The 4.x series is a development of the 2.x and 3.x series, and the above
comments apply.
-----------------
* 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.
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
-----------------
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
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
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
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,
#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. */
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. */
(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;
continue;
}
- /* Handle time period formating */
+ /* Handle time period formatting */
case EOP_TIME_EVAL:
{
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 */
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 &&
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)
/* 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
/* 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 == '.')
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;
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);
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);
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);
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);
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
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
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
*/
}
#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;
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
(7) Otherwise, the line is an input line line that is sent to the server. Any
occurrences of \r and \n in the line are turned into carriage return and
linefeed, respectively. This is used for testing PIPELINING.
- Any sequences of \x followed by two hex digits are converted to the equvalent
+ Any sequences of \x followed by two hex digits are converted to the equivalent
byte value. Any other character following a \ is sent verbatim.
The line is sent with a trailing "\r\n".
rest expire in 2038). The "1" and "2" systems/certs have
equivalent properties.
-In each certicate subdir: the ".db" files are NSS version of the cert,
+In each certificate subdir: the ".db" files are NSS version of the cert,
the ".pem", ".key" and ".unlocked.key" are usable by OpenSSL (the
ca_chain.pem being a copy of the CA public information and signer
public information).
# The "munge" command selects one of a hardwired set of test-result modifications
-# to be made before result compares are run agains the golden set. This lets
+# to be made before result compares are run against the golden set. This lets
# us account for test-system dependent things which only affect a few, but known,
# test-cases.
# Currently only the last munge takes effect.
git://git.exim.org / users / jgh / exim.git / commitdiff