summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-01-04 00:38:21 +0000
committerngie <ngie@FreeBSD.org>2017-01-04 00:38:21 +0000
commite157ab5d279f81423fa91d4ac2947944a18e3696 (patch)
tree546390e9687db6307f1e5553b5cf34c7590cf720
parentafe90046a8c2880e68184e439e2895234d0df105 (diff)
downloadFreeBSD-src-e157ab5d279f81423fa91d4ac2947944a18e3696.zip
FreeBSD-src-e157ab5d279f81423fa91d4ac2947944a18e3696.tar.gz
MFstable/11 r311207:
MFC r310099,r311000,r311002: r311000: Fix spelling errors r311002: Install bsnmpclient(3) as snmp_client_{init,set_host,set_port}(3)
-rw-r--r--contrib/bsnmp/lib/bsnmpclient.312
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile3
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc3
3 files changed, 12 insertions, 6 deletions
diff --git a/contrib/bsnmp/lib/bsnmpclient.3 b/contrib/bsnmp/lib/bsnmpclient.3
index 7a13a89..a050777 100644
--- a/contrib/bsnmp/lib/bsnmpclient.3
+++ b/contrib/bsnmp/lib/bsnmpclient.3
@@ -208,13 +208,13 @@ The community name to be used for SET requests.
The default is
.Sq private .
.It Va identifier
-The message indentifier value to be used with SNMPv3 PDUs. Incremented with
+The message identifier value to be used with SNMPv3 PDUs. Incremented with
each transmitted PDU.
.It Va security_model
The security model to be used with SNMPv3 PDUs. Currently only User-Based
Security model specified by RFC 3414 (value 3) is supported.
.It Va engine
-The authorative SNMP engine parameters to be used with SNMPv3 PDUs.
+The authoritive SNMP engine parameters to be used with SNMPv3 PDUs.
.It Va user
The USM SNMP user credentials to be used with SNMPv3 PDUs.
.It Va clen
@@ -413,7 +413,7 @@ response is received.
When a response is received or the retransmission count
is exceeded the callback
.Fa func
-is called with the orignal request PDU, the response PDU and the user argument
+is called with the original request PDU, the response PDU and the user argument
.Fa uarg .
If the retransmit count is exceeded,
.Fa func
@@ -648,7 +648,7 @@ If a response was received 0 is returned.
.Pp
The function
.Fn snmp_discover_engine
-is used to discover the authorative snmpEngineId of a remote SNMPv3 agent.
+is used to discover the authoritative snmpEngineId of a remote SNMPv3 agent.
A request PDU with empty USM user name is sent and the client's engine
parameters are set according to the snmpEngine parameters received in the
response PDU.
@@ -656,10 +656,10 @@ If the client is configured to use authentication and/or privacy and the
snmpEngineBoots and/or snmpEngineTime in the response had zero values, an
additional request (possibly encrypted) with the appropriate user credentials
is sent to fetch the missing values.
-Note, that the function blocks until the discovery proccess is completed.
+Note, that the function blocks until the discovery process is completed.
If no response could be received after all timeouts and retries, or the
response contained errors the function returns -1.
-If the discovery proccess was completed 0 is returned.
+If the discovery process was completed 0 is returned.
.Pp
The function
.Fn snmp_parse_server
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 7c76070..a756f90 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -77,6 +77,9 @@ MLINKS+= bsnmpagent.3 tree_size.3
MLINKS+= bsnmpclient.3 snmp_add_binding.3
MLINKS+= bsnmpclient.3 snmp_client.3
+MLINKS+= bsnmpclient.3 snmp_client_init.3
+MLINKS+= bsnmpclient.3 snmp_client_set_host.3
+MLINKS+= bsnmpclient.3 snmp_client_set_port.3
MLINKS+= bsnmpclient.3 snmp_close.3
MLINKS+= bsnmpclient.3 snmp_dialog.3
MLINKS+= bsnmpclient.3 snmp_discover_engine.3
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 6ca2177..b02cfa5 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -448,6 +448,9 @@ OLD_FILES+=usr/share/man/man3/asn_slice_oid.3.gz
OLD_FILES+=usr/share/man/man3/snmp_add_binding.3.gz
OLD_FILES+=usr/share/man/man3/snmp_calc_keychange.3.gz
OLD_FILES+=usr/share/man/man3/snmp_client.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_init.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_set_host.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_set_port.3.gz
OLD_FILES+=usr/share/man/man3/snmp_close.3.gz
OLD_FILES+=usr/share/man/man3/snmp_debug.3.gz
OLD_FILES+=usr/share/man/man3/snmp_dep_commit.3.gz
OpenPOWER on IntegriCloud