summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2007-02-25 22:04:13 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2007-02-25 22:04:13 +0000
commit73917fcb55a6931f8a4069f23904b8876ec26a58 (patch)
tree9b73acd2efebee66aacc3e8dcad2be834b0dee7b
parent683f70dff9c4f6ea7883a9df776582b91b52339d (diff)
- HELO/EHLO is part of the tuple
- remove misleading sentence ok millert
-rw-r--r--libexec/spamd/spamd.89
1 files changed, 3 insertions, 6 deletions
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index cef7e9c4ce0..f170485bfb4 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd.8,v 1.71 2007/02/25 20:21:01 millert Exp $
+.\" $OpenBSD: spamd.8,v 1.72 2007/02/25 22:04:12 jmc Exp $
.\"
.\" Copyright (c) 2002 Theo de Raadt. All rights reserved.
.\"
@@ -273,7 +273,8 @@ will use the db file in
.Pa /var/db/spamd
to track these non-blacklisted connections to
.Nm
-by connecting IP address, envelope-from, and envelope-to, or "tuple" for
+by connecting IP address, HELO/EHLO, envelope-from, and envelope-to,
+or "tuple" for
short.
.Pp
A previously unseen tuple is added to the
@@ -312,10 +313,6 @@ rdr pass inet proto tcp from any to any \e
port smtp -> 127.0.0.1 port spamd
.Ed
.Pp
-With this configuration,
-.Xr spamd-setup 8
-should be used to configure blacklists in
-.Nm .
Connections from addresses not listed in the
.Em spamd-white
.Xr pf 4