Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/gnu/dist/sendmail Pull up revisions 1.4-1.6 (requested ...
details: https://anonhg.NetBSD.org/src/rev/b49894e0bcff
branches: netbsd-1-5
changeset: 490781:b49894e0bcff
user: he <he%NetBSD.org@localhost>
date: Fri Mar 09 17:49:32 2001 +0000
description:
Pull up revisions 1.4-1.6 (requested by itojun):
Upgrade to sendmail 8.11.3.
diffstat:
gnu/dist/sendmail/cf/README | 218 ++++--
gnu/dist/sendmail/devtools/M4/UNIX/defines.m4 | 22 +-
gnu/dist/sendmail/doc/op/op.me | 233 +++++--
gnu/dist/sendmail/libmilter/README | 34 +-
gnu/dist/sendmail/libmilter/engine.c | 18 +-
gnu/dist/sendmail/libmilter/listener.c | 204 +++++-
gnu/dist/sendmail/libsmdb/smdb2.c | 68 ++-
gnu/dist/sendmail/mail.local/mail.local.c | 749 +++++++++++++------------
gnu/dist/sendmail/rmail/rmail.c | 29 +-
gnu/dist/sendmail/sendmail/README | 93 ++-
gnu/dist/sendmail/sendmail/collect.c | 81 +-
gnu/dist/sendmail/sendmail/control.c | 30 +-
gnu/dist/sendmail/sendmail/headers.c | 81 +-
gnu/dist/sendmail/sendmail/map.c | 214 +++++--
gnu/dist/sendmail/sendmail/milter.c | 205 +++++-
gnu/dist/sendmail/sendmail/parseaddr.c | 26 +-
gnu/dist/sendmail/sendmail/queue.c | 83 +-
gnu/dist/sendmail/sendmail/savemail.c | 23 +-
gnu/dist/sendmail/sendmail/srvrsmtp.c | 141 +++-
gnu/dist/sendmail/sendmail/usersmtp.c | 56 +-
gnu/dist/sendmail/vacation/vacation.c | 333 ++++++++---
21 files changed, 1932 insertions(+), 1009 deletions(-)
diffs (truncated from 6812 to 300 lines):
diff -r df50ed2e3f0b -r b49894e0bcff gnu/dist/sendmail/cf/README
--- a/gnu/dist/sendmail/cf/README Fri Mar 09 17:49:23 2001 +0000
+++ b/gnu/dist/sendmail/cf/README Fri Mar 09 17:49:32 2001 +0000
@@ -6,8 +6,8 @@
7th Edition version. SunOS's /usr/5bin/m4 or BSD-Net/2's m4 both work.
GNU m4 version 1.1 or later also works. Unfortunately, the M4 on BSDI 1.0
doesn't work -- you'll have to use a Net/2 or GNU version. GNU m4 is
-available from ftp://ftp.gnu.org/pub/gnu/m4-1.4.tar.gz (check for the
-latset version). EXCEPTIONS: DEC's m4 on Digital UNIX 4.x is broken (3.x
+available from ftp://ftp.gnu.org/pub/gnu/m4/m4-1.4.tar.gz (check for the
+latest version). EXCEPTIONS: DEC's m4 on Digital UNIX 4.x is broken (3.x
is fine). Use GNU m4 on this platform.
To get started, you may want to look at tcpproto.mc (for TCP-only sites),
@@ -54,7 +54,7 @@
divert(-1)
#
- # Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+ # Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -254,12 +254,13 @@
QUEUE_DIR [/var/spool/mqueue] The directory containing
queue files. To use multiple queues, supply
a value ending with an asterisk. For
- example, /var/spool/mqueue/q* will use all of the
+ example, /var/spool/mqueue/qd* will use all of the
directories or symbolic links to directories
- beginning with 'q' in /var/spool/mqueue as queue
+ beginning with 'qd' in /var/spool/mqueue as queue
directories. The names 'qf', 'df', and 'xf' are
- used as specific subdirectories for the corresponding
- queue file types.
+ reserved as specific subdirectories for the
+ corresponding queue file types as explained in
+ doc/op/op.me.
STATUS_FILE [/etc/mail/statistics] The file containing status
information.
LOCAL_MAILER_PATH [/bin/mail] The program used to deliver local mail.
@@ -309,13 +310,13 @@
SMTP_MAILER_MAXMSGS [undefined] If defined, the maximum number of
messages to deliver in a single connection for the
smtp, smtp8, esmtp, or dsmtp mailers.
-SMTP_MAILER_ARGS [IPC $h] The arguments passed to the smtp mailer.
+SMTP_MAILER_ARGS [TCP $h] The arguments passed to the smtp mailer.
About the only reason you would want to change this
would be to change the default port.
-ESMTP_MAILER_ARGS [IPC $h] The arguments passed to the esmtp mailer.
-SMTP8_MAILER_ARGS [IPC $h] The arguments passed to the smtp8 mailer.
-DSMTP_MAILER_ARGS [IPC $h] The arguments passed to the dsmtp mailer.
-RELAY_MAILER_ARGS [IPC $h] The arguments passed to the relay mailer.
+ESMTP_MAILER_ARGS [TCP $h] The arguments passed to the esmtp mailer.
+SMTP8_MAILER_ARGS [TCP $h] The arguments passed to the smtp8 mailer.
+DSMTP_MAILER_ARGS [TCP $h] The arguments passed to the dsmtp mailer.
+RELAY_MAILER_ARGS [TCP $h] The arguments passed to the relay mailer.
RELAY_MAILER_MAXMSGS [undefined] If defined, the maximum number of
messages to deliver in a single connection for the
relay mailer.
@@ -426,13 +427,16 @@
of the form node::user will not work.
FAX_RELAY The host that will accept mail to the .FAX pseudo-domain.
The "fax" mailer overrides this value.
-LOCAL_RELAY DEPRECATED. The site that will handle unqualified
- names -- that is, names with out an @domain extension.
- If not set, they are assumed to belong on this machine.
- This allows you to have a central site to store a
- company- or department-wide alias database. This
- only works at small sites, and only with some user
- agents.
+LOCAL_RELAY The site that will handle unqualified names -- that
+ is, names with out an @domain extension.
+ Normally MAIL_HUB is preferred for this function.
+ LOCAL_RELAY is mostly useful in conjunction with
+ FEATURE(stickyhost) -- see the discussion of
+ stickyhost below. If not set, they are assumed to
+ belong on this machine. This allows you to have a
+ central site to store a company- or department-wide
+ alias database. This only works at small sites,
+ and only with some user agents.
LUSER_RELAY The site that will handle lusers -- that is, apparently
local names that aren't local accounts or aliases. To
specify a local user instead of a site, set this to
@@ -488,7 +492,7 @@
demand delivery, and "relay" for transmission to the
RELAY_HOST, LUSER_RELAY, or MAIL_HUB.
-uucp The Unix-to-Unix Copy Program mailer. Actually, this
+uucp The UNIX-to-UNIX Copy Program mailer. Actually, this
defines two mailers, "uucp-old" (a.k.a. "uucp") and
"uucp-new" (a.k.a. "suucp"). The latter is for when you
know that the UUCP mailer at the other end can handle
@@ -513,7 +517,7 @@
fax Facsimile transmission. This is experimental and based
on Sam Leffler's HylaFAX software. For more information,
- see http://www.vix.com/hylafax/.
+ see http://www.hylafax.org/.
pop Post Office Protocol.
@@ -623,8 +627,10 @@
given as parameter.
nocanonify Don't pass addresses to $[ ... $] for canonification
- by default. It can be changed by setting the
- DaemonPortOptions modifiers (M=). That is,
+ by default, i.e., host/domain names are considered canonical,
+ except for unqualified names, which must not be used in this
+ mode (violation of the standard). It can be changed by
+ setting the DaemonPortOptions modifiers (M=). That is,
FEATURE(`nocanonify') will be overridden by setting the
'c' flag. Conversely, if FEATURE(`nocanonify') is not used,
it can be emulated by setting the 'C' flag
@@ -656,14 +662,22 @@
<user@host>, will be canonified (and hopefully fully
qualified), too.
-stickyhost If set, email sent to "user%local.host@localhost" are marked
- as "sticky" -- that is, the local addresses aren't
- matched against UDB and don't go through ruleset 5.
- This is used if you want a set up where "user" is
- not necessarily the same as "user%local.host@localhost", e.g.,
- to make a distinct domain-wide namespace. Prior to
- 8.7 this was the default, and notsticky was used to
- turn this off.
+stickyhost This feature is sometimes used with LOCAL_RELAY,
+ although it can be used for a different effect with
+ MAIL_HUB.
+
+ When used without MAIL_HUB, email sent to
+ "user%local.host@localhost" are marked as "sticky" -- that
+ is, the local addresses aren't matched against UDB,
+ don't go through ruleset 5, and are not forwarded to
+ the LOCAL_RELAY (if defined).
+
+ With MAIL_HUB, mail addressed to "user%local.host@localhost"
+ is forwarded to the mail hub, with the envelope
+ address still remaining "user%local.host@localhost".
+ Without stickyhost, the envelope would be changed
+ to "user@mail_hub", in order to protect against
+ mailing loops.
mailertable Include a "mailer table" which can be used to override
routing for particular domains (which are not in class {w},
@@ -1064,6 +1078,12 @@
described in the anti-spam configuration control section
later in this document.
+delay_checks The rulesets check_mail and check_relay will not be called
+ when a client connects or issues a MAIL command, respectively.
+ Instead, those rulesets will be called by the check_rcpt
+ ruleset; they will be skipped under certain circumstances.
+ See "Delay all checks" in "ANTI-SPAM CONFIGURATION CONTROL".
+
rbl This feature is deprecated! Please use dnsbl instead.
Turns on rejection of hosts found in the Realtime Blackhole
List. If an argument is provided it is used as the domain
@@ -1074,13 +1094,13 @@
dnsbl Turns on rejection of hosts found in an DNS based rejection
list. If an argument is provided it is used as the domain
in which blocked hosts are listed; otherwise it defaults to
- rbl.maps.vix.com. An explanation for an DNS based rejection
- list can be found http://maps.vix.com/rbl/. A second argument
- can be used to change the default error message of
- Mail from $&{client_addr} refused by blackhole site SERVER
- where SERVER is replaced by the first argument. This feature
- can be included several times to query different DNS based
- rejection lists.
+ blackholes.mail-abuse.org. An explanation for an DNS based
+ rejection list can be found http://mail-abuse.org/rbl/. A
+ second argument can be used to change the default error
+ message of Mail from $&{client_addr} refused by blackhole site
+ SERVER where SERVER is replaced by the first argument. This
+ feature can be included several times to query different DNS
+ based rejection lists.
loose_relay_check
Normally, if % addressing is used for a recipient, e.g.
@@ -1227,7 +1247,7 @@
On host grasp.insa-lyon.fr (UUCP host name "grasp"), the following
summarizes the sender rewriting for various mailers.
-Mailer sender rewriting in the envelope
+Mailer sender rewriting in the envelope
------ ------ -------------------------
uucp-{old,new} wolf grasp!wolf
uucp-dom wolf wolf%grasp.insa-lyon.fr@localhost
@@ -1706,15 +1726,14 @@
REJECT Reject the sender or recipient with a general
purpose message.
DISCARD Discard the message completely using the
- $#discard mailer. For sender addresses it
- indicates that you should discard anything
- received from the indicated domain. If it
- is used for recipients, it affects only
- the designated recipients, not the whole
- message.
- ### any text where ### is an RFC 821 compliant error code
- and "any text" is a message to return for
- the command.
+ $#discard mailer. If it is used in check_compat,
+ it affects only the designated recipient, not
+ the whole message as it does in all other cases.
+ This should only be used if really necessary.
+ ### any text where ### is an RFC 821 compliant error code and
+ "any text" is a message to return for the command.
+ The string should be quoted to avoid surprises,
+ e.g., sendmail may remove spaces otherwise.
ERROR:### any text
as above, but useful to mark error messages as such.
ERROR:D.S.N:### any text
@@ -1723,7 +1742,7 @@
For example:
- cyberspammer.com 550 We don't accept mail from spammers
+ cyberspammer.com ERROR:"550 We don't accept mail from spammers"
okay.cyberspammer.com OK
sendmail.org RELAY
128.32 RELAY
@@ -1761,7 +1780,7 @@
You can also use the access database to block sender addresses based on
the username portion of the address. For example:
- FREE.STEALTH.MAILER@ 550 Spam not accepted
+ FREE.STEALTH.MAILER@ ERROR:550 Spam not accepted
Note that you must include the @ after the username to signify that
this database entry is for checking only the username portion of the
@@ -1774,9 +1793,9 @@
then you can add entries to the map for local users, hosts in your
domains, or addresses in your domain which should not receive mail:
- badlocaluser@ 550 Mailbox disabled for this username
- host.mydomain.com 550 That host does not accept mail
- user%otherhost.mydomain.com@localhost 550 Mailbox disabled for this recipient
+ badlocaluser@ ERROR:550 Mailbox disabled for this username
+ host.mydomain.com ERROR:550 That host does not accept mail
+ user%otherhost.mydomain.com@localhost ERROR:550 Mailbox disabled for this recipient
This would prevent a recipient of badlocaluser%mydomain.com@localhost, any
user at host.mydomain.com, and the single address
@@ -1802,11 +1821,14 @@
This will cause sendmail to reject mail from any site in the
Realtime Blackhole List database. You can specify an alternative
RBL domain to check by specifying an argument to the FEATURE.
-A second argument can be used to change the default error message
-Mail from $&{client_addr} refused by blackhole site DOMAIN
-where DOMAIN is replaced by the first argument. This FEATURE can
-be included several times to query different DNS based rejection
-lists, e.g., the dial-up user list (see http://maps.vix.com/dul/).
+The default error message is
+
+ Mail from $&{client_addr} refused by blackhole site DOMAIN
+
+where DOMAIN is the first argument of the feature. A second argument
+can be used to specify a different text. This FEATURE can be
+included several times to query different DNS based rejection lists,
+e.g., the dial-up user list (see http://maps.vix.com/dul/).
The features described above make use of the check_relay, check_mail,
and check_rcpt rulesets. If you wish to include your own checks,
@@ -1839,8 +1861,8 @@
access map according to their type. Three tags are available:
Connect: connection information (${client_addr}, ${client_name})
- From: sender
- To: recipient
+ From: envelope sender
+ To: envelope recipient
If the required item is looked up in a map, it will be tried first
with the corresponding tag in front, then (as fallback to enable
@@ -1892,7 +1914,7 @@
Connect:my.domain RELAY
if you need those entries at all (class {R} may take care of them).
-
+
FEATURE(`delay_checks') can take an optional argument:
FEATURE(`delay_checks', `friend')
@@ -1945,6 +1967,11 @@
H*: $>CheckHdr
+Notice: All rules act on tokens as explained in doc/op/op.{me,ps,txt}.
+That may cause problems with simple header checks due to the
+tokenization. It might be simpler to use a regex map and apply it
+to $&{currHeader}.
+
After all of the headers are read, the check_eoh ruleset will be called for
any final header-related checks. The ruleset is called with the number of
headers and the size of all of the headers in bytes separated by $|. One
@@ -1979,9 +2006,9 @@
# Otherwise, reject the mail
R$* $#error $: 553 Header Error
Home |
Main Index |
Thread Index |
Old Index