merge/update the spamlogd rules into spamd - there were some subtle

problems because of the recent pf nat changes that caused problems;
i've fleshed out the example in spamd and just added a pointer to it
from spamlogd;

ok beck

2 files changed, 19 insertions, 20 deletions

diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index 1ff678b460f..75b91784e20 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.8,v 1.116 2009/09/07 09:43:57 jmc Exp $
+.\"	$OpenBSD: spamd.8,v 1.117 2009/09/17 06:37:54 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Theo de Raadt.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 7 2009 $
+.Dd $Mdocdate: September 17 2009 $
 .Dt SPAMD 8
 .Os
 .Sh NAME
@@ -277,16 +277,23 @@ Any addresses not found in
 .Aq spamd-white
 are redirected to
 .Nm .
-The following
+.Pp
+An example
 .Xr pf.conf 5
-example is suggested:
+fragment is given below.
+In the example, the file
+.Pa /etc/mail/nospamd
+contains addresses of hosts who should be passed directly
+to the SMTP agent (thus bypassing
+.Nm ) .
 .Bd -literal -offset 4n
 table \*(Ltspamd-white\*(Gt persist
-table \*(Ltnospamd\*(Gt persist
+table \*(Ltnospamd\*(Gt persist file "/etc/mail/nospamd"
 pass in on egress proto tcp from any to any port smtp \e
     rdr-to 127.0.0.1 port spamd
 pass in on egress proto tcp from \*(Ltnospamd\*(Gt to any port smtp
-pass in on egress proto tcp from \*(Ltspamd-white\*(Gt to any port smtp
+pass in log on egress proto tcp from \*(Ltspamd-white\*(Gt to any port smtp
+pass out log on egress proto tcp to any port smtp
 .Ed
 .Pp
 .Nm
diff --git a/libexec/spamlogd/spamlogd.8 b/libexec/spamlogd/spamlogd.8
index 4b7d6ae961b..b48c59e7018 100644
--- a/libexec/spamlogd/spamlogd.8
+++ b/libexec/spamlogd/spamlogd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamlogd.8,v 1.15 2009/07/02 18:07:45 schwarze Exp $
+.\"	$OpenBSD: spamlogd.8,v 1.16 2009/09/17 06:37:54 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Bob Beck.  All rights reserved.
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 2 2009 $
+.Dd $Mdocdate: September 17 2009 $
 .Dt SPAMLOGD 8
 .Os
 .Sh NAME
@@ -84,21 +84,13 @@ below.
 This option can be specified multiple times.
 .El
 .Pp
-It is important to be sure to log any connections to and from your real
+It is important to log any connections to and from the real
 MTA in order for
 .Nm
 to update the whitelist entries.
-An example
-.Xr pf.conf 5
-configuration for logging such connections is as follows:
-.Bd -literal -offset indent
-EXT_IF = "fxp0"
-MAILHOSTS = "{129.128.11.10, 129.128.11.43}"
-pass in log on $EXT_IF inet proto tcp to $MAILHOSTS \e
-	port smtp
-pass out log on $EXT_IF inet proto tcp from $MAILHOSTS \e
-	to any port smtp
-.Ed
+See
+.Xr spamd 8
+for an example ruleset for logging such connections.
 .Pp
 .Nm
 sends log messages to