From 0871cc42c029bf74a16aafb13b6b39196160158e Mon Sep 17 00:00:00 2001 From: Jason McIntyre Date: Wed, 7 Mar 2007 09:10:11 +0000 Subject: clean up the greytrap stuff; --- libexec/spamd/spamd.8 | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8 index 3c75a849b7f..abb8df471ca 100644 --- a/libexec/spamd/spamd.8 +++ b/libexec/spamd/spamd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: spamd.8,v 1.95 2007/03/07 08:46:23 jmc Exp $ +.\" $OpenBSD: spamd.8,v 1.96 2007/03/07 09:10:10 jmc Exp $ .\" .\" Copyright (c) 2002 Theo de Raadt. All rights reserved. .\" @@ -153,9 +153,8 @@ By default .Nm listens on all local addresses. .It Fl M Ar address -Specify a local address which is listed as a low priority -MX record, used to identify and trap hosts that connect to MX -hosts out of order. +Specify a local IP address which is listed as a low priority MX record, +used to identify and trap hosts that connect to MX hosts out of order. See .Sx GREYTRAPPING below for details. @@ -341,16 +340,14 @@ it may be useful to define .Em spamtrap destination addresses to catch spammers as they send mail from greylisted hosts. -Such -.Em spamtrap -addresses affect only greylisted connections to +Such spamtrap addresses affect only greylisted connections to .Nm and are used to temporarily blacklist a host that is obviously sending spam. Unused email addresses or email addresses on spammers' lists are very useful for this. When a host that is currently greylisted attempts to send mail to a -.Em spamtrap -address, it is blacklisted for 24 hours by adding the host to the +spamtrap address, +it is blacklisted for 24 hours by adding the host to the .Nm blacklist .Aq spamd-greytrap . @@ -371,30 +368,31 @@ The file can be used to specify a list of domainname suffixes, one per line, one of which must match each destination email address in the greylist. Any destination address which does not match one of the suffixes listed in -.Pa /etc/mail/spamd.alloweddomains -will be trapped, exactly as if it were sent to a -.Em spamtrap -address above. +.Pa spamd.alloweddomains +will be trapped, exactly as if it were sent to a spamtrap address. .Pp For example, if -.Pa /etc/mail/spamd.alloweddomains +.Pa spamd.alloweddomains contains: -.Bd -literal -offset 4n +.Bd -literal -offset indent @humpingforjesus.com obtuse.com .Ed .Pp -the destination addresses -.Em beardedclams@humpingforjesus.com , -.Em beck@obtuse.com , -and -.Em beck@snouts.obtuse.com -would not cause the sending host to be trapped. -However the addresses -.Em peter@apostles.humpingforjesus.com -or -.Em bigbutts@bofh.ucs.ualberta.ca -would cause the sending host to be trapped. +The following destination addresses +would not cause the sending host to be trapped: +.Bd -literal -offset indent +beardedclams@humpingforjesus.com +beck@obtuse.com +beck@snouts.obtuse.com +.Ed +.Pp +However the following addresses +would cause the sending host to be trapped: +.Bd -literal -offset indent +peter@apostles.humpingforjesus.com +bigbutts@bofh.ucs.ualberta.ca +.Ed .Pp A low priority MX IP address may be specified with the .Fl M @@ -402,7 +400,7 @@ option. When .Nm has such an address specified, no host may enter new greylist -tuples when connecting to this address, only existing entries +tuples when connecting to this address; only existing entries may be updated. Any host attempting to make new deliveries to the low priority MX for which a tuple has not previously @@ -410,7 +408,7 @@ been seen will be trapped. .Pp Note that is is important to ensure that a host running .Nm -with the low priorty MX address active must see all the greylist +with the low priority MX address active must see all the greylist changes for a higher priority MX host for the same domains, either by being synchronised with it, or by receiving the connections itself to the higher priority MX on another IP address. @@ -552,7 +550,7 @@ sending or receiving synchronisation messages. .Sh FILES .Bl -tag -width "/etc/mail/spamd.alloweddomainsXX" -compact .It /etc/mail/spamd.alloweddomains -Optional required suffixes for greytrapping. +Required suffixes for greytrapping. .It /etc/mail/spamd.conf Default configuration file. .It /etc/mail/spamd.key -- cgit v1.2.3