summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2017-05-28 08:59:06 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2017-05-28 08:59:06 +0000
commit5293fe69c1c82f6a522c5ecbe0eef4e5bbc85b7e (patch)
tree442ca5e37b75cdc597fcc5adfdef2949b2a63e97 /usr.sbin/smtpd
parent7a84984d36aac8f6b9c4288d5cdb37df4e392008 (diff)
split the two "listen on" directives into two separate items;
the markup that we were using wouldn;t have worked with groff anyway but, more worringly, it didn;t work with mandoc either;
Diffstat (limited to 'usr.sbin/smtpd')
-rw-r--r--usr.sbin/smtpd/smtpd.conf.550
1 files changed, 23 insertions, 27 deletions
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 7aa2c4244fe..6c95a5a08e5 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.169 2017/05/24 13:26:03 jmc Exp $
+.\" $OpenBSD: smtpd.conf.5,v 1.170 2017/05/28 08:59:05 jmc Exp $
.\"
.\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.\"
-.Dd $Mdocdate: May 24 2017 $
+.Dd $Mdocdate: May 28 2017 $
.Dt SMTPD.CONF 5
.Os
.Sh NAME
@@ -655,7 +655,24 @@ Changing the default value might degrade performance.
.It Xo
.Ic listen on socket
.Op Ic mask-source
-.br
+.Xc
+Specify a
+.Ic socket
+to listen on for incoming connections.
+This directive is used to modify the behavior of the listener handling
+messages submitted through the local enqueuer, for example via the
+.Xr mail 1
+utility.
+It is optional: if unspecified then
+.Xr smtpd 8
+will simply listen for connections on the
+.Ic socket
+as if it was configured with no option.
+Clients connecting through the
+.Ic socket
+will always be tagged with the 'local'
+.Ic tag .
+.It Xo
.Bk -words
.Ic listen on Ar interface
.Op Ar family
@@ -673,32 +690,11 @@ Changing the default value might degrade performance.
.Op Ic no-dsn
.Ek
.Xc
-.Pp
-Specify a
-.Ic socket
-or an
+Specify an
.Ar interface
+and optional
+.Ar port
to listen on for incoming connections.
-The
-.Ic listen on socket
-directive is used to modify the behavior of the listener handling
-messages submitted through the local enqueuer, for example via the
-.Xr mail 1
-utility.
-This is an optional directive: if unspecified then
-.Xr smtpd 8
-will simply listen for connections on the
-.Ic socket
-as if it was configured with no option.
-Clients connecting through the
-.Ic socket
-will always be tagged with the 'local'
-.Ic tag .
-.Pp
-To listen on a specific network interface, specify an
-.Ar interface
-and an optional
-.Ar port .
An interface group, an IP address or a domain name may
be used in place of
.Ar interface .