summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2013-10-17 09:14:03 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2013-10-17 09:14:03 +0000
commit135b79ce3ab98b21d6acd0bff6f8dc9fe355ea85 (patch)
tree442439f774a5599ff3d6de8b0279b229416dd2fb
parente5c8709102eeaac67bb97a1ee67ed8b5ea981263 (diff)
Less ambiguous wording concerning control socket configuration options.
requested by and ok deraadt@
-rw-r--r--usr.sbin/bgpd/bgpd.conf.56
-rw-r--r--usr.sbin/snmpd/snmpd.conf.59
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/bgpd/bgpd.conf.5 b/usr.sbin/bgpd/bgpd.conf.5
index e3d7a152795..28852119f03 100644
--- a/usr.sbin/bgpd/bgpd.conf.5
+++ b/usr.sbin/bgpd/bgpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.conf.5,v 1.127 2013/10/16 21:17:27 jmc Exp $
+.\" $OpenBSD: bgpd.conf.5,v 1.128 2013/10/17 09:14:02 blambert Exp $
.\"
.\" Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
.\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -16,7 +16,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: October 16 2013 $
+.Dd $Mdocdate: October 17 2013 $
.Dt BGPD.CONF 5
.Os
.Sh NAME
@@ -391,7 +391,7 @@ rde rib Loc-RIB rtable number
.Ed
.Pp
.It Ic socket Qo Ar path Qc Op Ic restricted
-Set the control socket location to
+Create a control socket at
.Ar path .
If
.Ic restricted
diff --git a/usr.sbin/snmpd/snmpd.conf.5 b/usr.sbin/snmpd/snmpd.conf.5
index 4b8a25ecdd3..d84d9caf4b2 100644
--- a/usr.sbin/snmpd/snmpd.conf.5
+++ b/usr.sbin/snmpd/snmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.conf.5,v 1.27 2013/10/16 21:17:27 jmc Exp $
+.\" $OpenBSD: snmpd.conf.5,v 1.28 2013/10/17 09:14:01 blambert Exp $
.\"
.\" Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -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: October 16 2013 $
+.Dd $Mdocdate: October 17 2013 $
.Dt SNMPD.CONF 5
.Os
.Sh NAME
@@ -137,11 +137,14 @@ will accept only SNMPv3 requests since older versions neither support
authentication nor encryption.
.Pp
.It Ic socket Qo Ar path Qc Op Ic restricted
-Set the control socket location to
+Create a control socket at
.Ar path .
If
.Ic restricted
is specified a restricted control socket will be created.
+Multiple
+.Ic restricted
+sockets may be created.
By default
.Pa /var/run/snmpd.sock
is used and no restricted socket is created.