summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2005-08-06 19:52:36 +0000
committerjmc <jmc@openbsd.org>2005-08-06 19:52:36 +0000
commit68a0f2af0280333031436729383a4db3d4501ad3 (patch)
tree3b0244fe3edbc89612df51f40e28bb9876d40c2f
parentoverhaul the grf driver: (diff)
downloadwireguard-openbsd-68a0f2af0280333031436729383a4db3d4501ad3.tar.xz
wireguard-openbsd-68a0f2af0280333031436729383a4db3d4501ad3.zip
replace port number 8025 w/ symbolic `spamd';
ok krw@ deraadt@ diff from ray lai;
-rw-r--r--libexec/spamd/spamd.811
-rw-r--r--share/man/man5/pf.conf.54
-rw-r--r--share/pf/spamd4
3 files changed, 9 insertions, 10 deletions
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index f59080b349e..15e40a89423 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd.8,v 1.56 2005/05/17 08:25:55 jmc Exp $
+.\" $OpenBSD: spamd.8,v 1.57 2005/08/06 19:52:36 jmc Exp $
.\"
.\" Copyright (c) 2002 Theo de Raadt. All rights reserved.
.\"
@@ -180,14 +180,13 @@ to simplify handling.
.Bd -literal -offset 4n
table <spamd> persist
rdr pass inet proto tcp from <spamd> to any \e
- port smtp -> 127.0.0.1 port 8025
+ port smtp -> 127.0.0.1 port spamd
.Ed
.Pp
Any addresses in table
.Em <spamd>
are then redirected to
-.Nm
-running on port 8025.
+.Nm .
Addresses can be loaded into the
.Em table ,
like:
@@ -300,9 +299,9 @@ example:
table <spamd> persist
table <spamd-white> persist
rdr pass inet proto tcp from <spamd> to any \e
- port smtp -> 127.0.0.1 port 8025
+ port smtp -> 127.0.0.1 port spamd
rdr pass inet proto tcp from !<spamd-white> to any \e
- port smtp -> 127.0.0.1 port 8025
+ port smtp -> 127.0.0.1 port spamd
.Ed
.Pp
With this configuration,
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 0ad45af68c9..298c554b451 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pf.conf.5,v 1.336 2005/08/05 22:35:59 dhartmei Exp $
+.\" $OpenBSD: pf.conf.5,v 1.337 2005/08/06 19:52:36 jmc Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
.\" All rights reserved.
@@ -1084,7 +1084,7 @@ or to the firewall itself.
Note that redirecting external incoming connections to the loopback
address, as in
.Bd -literal -offset indent
-rdr on ne3 inet proto tcp to port 8025 -> 127.0.0.1 port 25
+rdr on ne3 inet proto tcp to port spamd -> 127.0.0.1 port smtp
.Ed
.Pp
will effectively allow an external host to connect to daemons
diff --git a/share/pf/spamd b/share/pf/spamd
index e63b52529c9..31b24adc3f5 100644
--- a/share/pf/spamd
+++ b/share/pf/spamd
@@ -1,7 +1,7 @@
-# $OpenBSD: spamd,v 1.1 2003/08/22 15:25:01 henning Exp $
+# $OpenBSD: spamd,v 1.2 2005/08/06 19:52:37 jmc Exp $
# spamd-setup puts addresses to be redirected into table <spamd>.
table <spamd> persist
no rdr on { lo0, lo1 } from any to any
-rdr inet proto tcp from <spamd> to any port smtp -> 127.0.0.1 port 8025
+rdr inet proto tcp from <spamd> to any port smtp -> 127.0.0.1 port spamd