summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2011-10-03 17:57:44 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2011-10-03 17:57:44 +0000
commit7f96b2f9e370da08207eef2fb18888d16b1774b9 (patch)
treed7fcc9c5e2ce4a7ac30bc2e432d1c52687f5c4e4 /usr.sbin/smtpd
parent8a8f346ce6ea35223e0e2100ec3d75d1fc2152f1 (diff)
clarify that network sources are to be specified in CIDR notation
by David Walker, ok jmc@
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/smtpd.conf.57
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 07f8381dea5..cadd3aa8456 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpd.conf.5,v 1.44 2011/06/23 20:35:22 sthen Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.45 2011/10/03 17:57:43 gilles Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -16,7 +16,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: June 23 2011 $
+.Dd $Mdocdate: October 3 2011 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -218,7 +218,8 @@ This is the default,
and may be omitted.
.It Ic from Ar network
The rule matches if the connection is made from the specified
-.Ar network .
+.Ar network ,
+specified in CIDR notation.
.El
.Pp
Next comes the selection based on the domain the message is sent to: