Spelling fixes for usr.sbin/

4 files changed, 21 insertions, 21 deletions

diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
index 97ef694..18b7eb6d 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
@@ -102,7 +102,7 @@
 and
 .Nm bsnmpset
 are simple tools for retrieving management information from and setting
-management information to a Simple Network Managment Protocol (SNMP) agent.
+management information to a Simple Network Management Protocol (SNMP) agent.
 .Pp
 Depending on the options
 .Nm bsnmpget
@@ -119,7 +119,7 @@ rooted at the provided OIDs.
 .Nm Bsnmpset
 constructs a SMNP SetRequest packet, fills in the OIDs (object identifiers),
 syntaxes and values of the objects whose values are to be set and waits for a
-responce from server.
+response from server.
 .Sh OPTIONS
 .Pp
 The options are as follows (not all apply to all three programs):
@@ -165,7 +165,7 @@ terminal.
 Retry on error.
 If an error is returned in the response PDU, resend the request removing the
 variable that caused the error until a valid response is received.
-This is only usefull for a GetRequest- and a GetNextRequest-PDU.
+This is only useful for a GetRequest- and a GetNextRequest-PDU.
 .It Fl h
 Print a short help text with default values for various options.
 .It Fl I Ar options
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
index c05a05a..b3c57b7 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
@@ -248,9 +248,9 @@ snmptool_parse_options(struct snmp_toolinfo *snmptoolctx, int argc, char **argv)
 
 /*
  * Read user input OID - one of following formats:
- * 1) 1.2.1.1.2.1.0 - that is if option numeric was giveni;
+ * 1) 1.2.1.1.2.1.0 - that is if option numeric was given;
  * 2) string - in such case append .0 to the asn_oid subs;
- * 3) string.1 - no additional proccessing required in such case.
+ * 3) string.1 - no additional processing required in such case.
  */
 static char *
 snmptools_parse_stroid(struct snmp_toolinfo *snmptoolctx,
@@ -458,7 +458,7 @@ static int
 snmptool_walk(struct snmp_toolinfo *snmptoolctx)
 {
 	struct snmp_pdu req, resp;
-	struct asn_oid root;	/* Keep the inital oid. */
+	struct asn_oid root;	/* Keep the initial oid. */
 	int32_t outputs, rc;
 
 	snmp_pdu_create(&req, SNMP_PDU_GETNEXT);
@@ -1105,13 +1105,13 @@ snmptool_set(struct snmp_toolinfo *snmptoolctx)
  */
 /*
  * According to command line options prepare SNMP Get | GetNext | GetBulk PDU.
- * Wait for a responce and print it.
+ * Wait for a response and print it.
  */
 /*
  * Do a 'snmp walk' - according to command line options request for values
  * lexicographically subsequent and subrooted at a common node. Send a GetNext
- * PDU requesting the value for each next variable and print the responce. Stop
- * when a Responce PDU is received that contains the value of a variable not
+ * PDU requesting the value for each next variable and print the response. Stop
+ * when a Response PDU is received that contains the value of a variable not
  * subrooted at the variable the walk started.
  */
 int
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
index dbaac5b..53deff7 100755
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
@@ -87,7 +87,7 @@ static const struct {
 	{ "General error", SNMP_ERR_GENERR },
 	{ "No access", SNMP_ERR_NO_ACCESS },
 	{ "Wrong type", SNMP_ERR_WRONG_TYPE },
-	{ "Wrong lenght", SNMP_ERR_WRONG_LENGTH },
+	{ "Wrong length", SNMP_ERR_WRONG_LENGTH },
 	{ "Wrong encoding", SNMP_ERR_WRONG_ENCODING },
 	{ "Wrong value", SNMP_ERR_WRONG_VALUE },
 	{ "No creation", SNMP_ERR_NO_CREATION },
@@ -227,12 +227,12 @@ snmp_import_all(struct snmp_toolinfo *snmptoolctx)
 }
 
 /*
- * Add a filename to the file list - the initail idea of keeping a list with all
+ * Add a filename to the file list - the initial idea of keeping a list with all
  * files to read OIDs from was that an application might want to have loaded in
  * memory the OIDs from a single file only and when done with them read the OIDs
  * from another file. This is not used yet but might be a good idea at some
  * point. Size argument is number of bytes in string including trailing '\0',
- * not string lenght.
+ * not string length.
  */
 int32_t
 add_filename(struct snmp_toolinfo *snmptoolctx, const char *filename,
@@ -449,7 +449,7 @@ parse_ascii(char *ascii, uint8_t *binstr, size_t binlen)
 	uint32_t val;
 	char dptr[3];
 
-	/* Filter 0x at the beggining */
+	/* Filter 0x at the beginning */
 	if ((alen = strlen(ascii)) > 2 && ascii[0] == '0' && ascii[1] == 'x')
 		i = 2;
 	else
@@ -468,7 +468,7 @@ parse_ascii(char *ascii, uint8_t *binstr, size_t binlen)
 		}
 		binstr[count] = (uint8_t) val;
 		if (++count >= binlen) {
-			warnx("Key %s too long - truncating to %zu octest",
+			warnx("Key %s too long - truncating to %zu octets",
 			    ascii, binlen);
 			break;
 		}
@@ -1523,10 +1523,10 @@ snmp_object_seterror(struct snmp_toolinfo *snmptoolctx,
 }
 
 /*
- * Check a PDU received in responce to a SNMP_PDU_GET/SNMP_PDU_GETBULK request
+ * Check a PDU received in response to a SNMP_PDU_GET/SNMP_PDU_GETBULK request
  * but don't compare syntaxes - when sending a request PDU they must be null.
  * This is a (almost) complete copy of snmp_pdu_check() - with matching syntaxes
- * checks and some other checks skiped.
+ * checks and some other checks skipped.
  */
 int32_t
 snmp_parse_get_resp(struct snmp_pdu *resp, struct snmp_pdu *req)
@@ -1605,7 +1605,7 @@ snmp_parse_getnext_resp(struct snmp_pdu *resp, struct snmp_pdu *req)
 }
 
 /*
- * Should be called to check a responce to get/getnext/getbulk.
+ * Should be called to check a response to get/getnext/getbulk.
  */
 int32_t
 snmp_parse_resp(struct snmp_pdu *resp, struct snmp_pdu *req)
@@ -1624,7 +1624,7 @@ snmp_parse_resp(struct snmp_pdu *resp, struct snmp_pdu *req)
 	}
 
 	if (resp->error_status != SNMP_ERR_NOERROR) {
-		warnx("Error %d in responce", resp->error_status);
+		warnx("Error %d in response", resp->error_status);
 		return (-1);
 	}
 
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
index 6e62186..ee28385 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
@@ -185,14 +185,14 @@ extern struct snmp_toolinfo snmptool;
 /* Definitions for some flags' bits. */
 #define	OUTPUT_BITS	0x00000003	/* bits 0-1 for output type */
 #define	NUMERIC_BIT	0x00000004	/* bit 2 for numeric oids */
-#define	RETRY_BIT	0x00000008 	/* bit 3 for retry on error responce */
+#define	RETRY_BIT	0x00000008 	/* bit 3 for retry on error response */
 #define	ERRIGNORE_BIT	0x00000010	/* bit 4 for skip sanity checking */
 #define	ERRIGNORE_BIT	0x00000010	/* bit 4 for skip sanity checking */
 #define	EDISCOVER_BIT	0x00000020	/* bit 5 for SNMP Engine Discovery */
 #define	LOCALKEY_BIT	0x00000040	/* bit 6 for using localized key */
-		/*	0x00000080 */	/* bit 7 reserverd */
+		/*	0x00000080 */	/* bit 7 reserved */
 #define	PDUTYPE_BITS	0x00000f00	/* bits 8-11 for pdu type */
-		/*	0x0000f000 */	/* bit 12-15 reserverd */
+		/*	0x0000f000 */	/* bit 12-15 reserved */
 #define	MAXREP_BITS	0x00ff0000	/* bits 16-23 for max-repetit. value */
 #define	NONREP_BITS	0xff000000	/* bits 24-31 for non-repeaters value */