- (FAQ, snmpcmd.1, snmptrap.1): minor doc updates.
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@3013 06827809-a52a-0410-b366-d66718629ded
diff --git a/FAQ b/FAQ
index e5c6edf..810fae7 100644
--- a/FAQ
+++ b/FAQ
@@ -338,8 +338,8 @@
the proponents of usec and v2star.
The formal successor to the SNMP-NG work has been termed SNMPv3.
- This has now been effectively finalised, and been put forward for
- approval as Proposed Standards. This is described in RFCs 2271-2275.
+ This has now been effectively finalised, and as been published as
+ Proposed Standards. This is described in RFCs 2571-2575.
@@ -736,10 +736,12 @@
As far as the applications are concerned, this is simply a matter of using
the "-v 3" option, and providing suitable values for the various SNMPv3
- parameters.
+ parameters. These are described in the snmpcmd(1) manual page.
Configuring the UCD agent is less straightforward. There is an initial
description of how to do this in the file 'README.snmpv3', but this is more
complex than we would like, and will hopefully be revised in the future.
+ Also see the snmpusm(1) manual page, as it describes some basic
+ information about how SNMPv3's user based security module works.
Watch this space....
diff --git a/man/snmpcmd.1 b/man/snmpcmd.1
index d806174..23916c9 100644
--- a/man/snmpcmd.1
+++ b/man/snmpcmd.1
@@ -28,12 +28,11 @@
[-h|-V]
[-R]
[-f|-s|-S] [-q]
-[-v (1 | 2c | 2p | 3) ]
+[-v (1 | 2c | 3) ]
[-d] [-D[TOKEN,TOKEN,...]]
[-R] [-f|-s|-S] [-q]
[-m mibs] [-M mibdirs]
[-r retries] [-t timeout] [-p port]
-[-c srcclock dstclock]
[-e engineid] [-T boots time] [-n contextname]
[-l seclevel] [-u secname]
[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd]
@@ -62,9 +61,9 @@
request the application to dump all SNMP packets send and received
.IP "-D"
request debugging output
-.IP "-v 1 | 2c | 2p | 3"
+.IP "-v 1 | 2c | 3"
specifies the protocol version to use: 1 (RFC 1155-1157), 2c (RFC 1901-1908),
-2p (RFC 1441-1452), or 3 (RFC 2271-2274)
+or 3 (RFC 2571-2574)
The default is -v 1
.IP "-R"
requests random access to the MIB symbol table. See RANDOM ACCESS MIB below.
@@ -120,8 +119,6 @@
.IP "-p port"
specifies the port to communicate with at the agent. The default is 161,
except for snmptrap, which defaults to 162.
-.IP "-c srcclock dstclock"
-sets the clock values to be used for authenticated SNMP v2p messages
.IP "-e engineid"
sets the authoritative(security) engineID used for SNMP v3 Request messages.
This is the engineID of the agent or proxy (e.g., 800000020109840301). (will
@@ -163,17 +160,6 @@
.I community
specifies the community name for the transaction with the remote system.
.PP
-The version 2p
-.IR srcParty ,
-.IR dstParty ,
-and
-.I context
-specify the party and context names for the transaction with the remote system, as
-they are defined in PREFIX/share/snmp/party.conf.
-To forgo authentication, use the
-.B noAuth
-keyword instead of specifying party names.
-.PP
.SH "RANDOM ACCESS MIBS"
Normally, an object identifier such as system.sysDescr.0 will be lookup
in a single "wellknown" place, built into the SNMP library (or specified
@@ -205,11 +191,9 @@
.SH FILES
.IP PREFIX/share/snmp/snmpd.conf
Agent configuration file. See snmpd.conf(5)
-.IP PREFIX/share/snmp/party.conf
-.IP PREFIX/share/snmp/context.conf
-.IP PREFIX/share/snmp/view.conf
-.IP PREFIX/share/snmp/acl.conf
-SNMP v2p configuration files. Obsolete.
+.IP PREFIX/share/snmp/snmp.conf
+.IP ~/.snmp/snmp.conf
+Application configuration files. See snmp.conf(5)
.SH "SEE ALSO"
snmpget(1), snmpgetnext(1), snmpset(1), snmpbulkwalk(1), snmpwalk(1),
-snmptable(1), snmpdelta(1), snmptrap(1).
+snmptable(1), snmpdelta(1), snmptrap(1), snmp.conf(5).
diff --git a/man/snmptrap.1 b/man/snmptrap.1
index 13252dd..4c416bf 100644
--- a/man/snmptrap.1
+++ b/man/snmptrap.1
@@ -26,7 +26,7 @@
.SH SYNOPSIS
snmptrap -v 1 [common arguments] enterprise-oid agent generic-trap specific-trap uptime [objectID type value]...
.PP
-snmptrap -v [2c|2p] [common arguments] uptime trap-oid [objectID type value]...
+snmptrap -v [2c|3] [common arguments] uptime trap-oid [objectID type value]...
.SH DESCRIPTION
Snmptrap is an SNMP application that uses the TRAP Request to send
information to a network manager. One or more fully qualified
