MFstable/11 r310901:

MFC r310648:

style(9): clean up trailing whitespace

85 files changed, 346 insertions, 346 deletions

diff --git a/contrib/bsnmp/gensnmpdef/gensnmpdef.1 b/contrib/bsnmp/gensnmpdef/gensnmpdef.1
index 678e345..5660095 100644
--- a/contrib/bsnmp/gensnmpdef/gensnmpdef.1
+++ b/contrib/bsnmp/gensnmpdef/gensnmpdef.1
@@ -4,7 +4,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/gensnmpdef/gensnmpdef.c b/contrib/bsnmp/gensnmpdef/gensnmpdef.c
index e4f1e5c..32c835d 100644
--- a/contrib/bsnmp/gensnmpdef/gensnmpdef.c
+++ b/contrib/bsnmp/gensnmpdef/gensnmpdef.c
@@ -1,10 +1,10 @@
-/* 
+/*
  * Copyright (C) 2004-2006
  * 	Hartmut Brandt.
  * 	All rights reserved.
- * 
+ *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -233,7 +233,7 @@ print_scalar(SmiNode *n, u_int level)
 	printf(" op_%s", p->name);
 
 	print_access(n->access);
-	
+
 	printf(")\n");
 }
 
@@ -422,7 +422,7 @@ static void
 print_enum_typedef(SmiType *t)
 {
 	SmiNamedNumber *nnum;
-	
+
 	for (nnum = smiGetFirstNamedNumber(t); nnum != NULL;
 	    nnum = smiGetNextNamedNumber(nnum)) {
 		printf("\t%ld %s\n" , nnum->value.value.integer32, nnum->name);
@@ -434,10 +434,10 @@ print_stype(SmiNode *n)
 {
 	SmiType *type;
 	struct tdef *t = NULL;
-	
+
 	type = smiGetNodeType(n);
 	assert(type != NULL);
-	
+
 	if (type->basetype == SMI_BASETYPE_ENUM) {
 		if (do_typedef == 'e' && type->name != NULL) {
 			SLIST_FOREACH(t, &tdefs, link) {
@@ -450,7 +450,7 @@ print_stype(SmiNode *n)
 			printf("typedef %sType ENUM (\n", n->name);
 		else
 			return;
-		
+
 		print_enum_typedef(type);
 		printf(")\n\n");
 
@@ -476,7 +476,7 @@ static void
 print_typdefs(SmiNode *n)
 {
 	SmiNode *p;
-	
+
 	p = n;
 	n = smiGetFirstChildNode(n);
 	while (n != NULL) {
diff --git a/contrib/bsnmp/gensnmptree/gensnmptree.1 b/contrib/bsnmp/gensnmptree/gensnmptree.1
index f9d8d53..c0046b5c 100644
--- a/contrib/bsnmp/gensnmptree/gensnmptree.1
+++ b/contrib/bsnmp/gensnmptree/gensnmptree.1
@@ -7,7 +7,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/gensnmptree/gensnmptree.c b/contrib/bsnmp/gensnmptree/gensnmptree.c
index 0eca777..f2dc4fd 100644
--- a/contrib/bsnmp/gensnmptree/gensnmptree.c
+++ b/contrib/bsnmp/gensnmptree/gensnmptree.c
@@ -8,7 +8,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,7 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -738,7 +738,7 @@ parse_type(enum tok *tok, struct type *t, const char *vname)
 				e->value = -(long)val;
 			} else
 				e->value = val;
-			
+
 			if (*tok != TOK_NUM)
 				report("need value for ENUM/BITS");
 			if (gettoken() != TOK_STR)
diff --git a/contrib/bsnmp/lib/asn1.3 b/contrib/bsnmp/lib/asn1.3
index 419a929..a9cf117 100644
--- a/contrib/bsnmp/lib/asn1.3
+++ b/contrib/bsnmp/lib/asn1.3
@@ -5,9 +5,9 @@
 .\" Copyright (c) 2001-2003
 .\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
 .\"	All rights reserved.
-.\" 
+.\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/asn1.c b/contrib/bsnmp/lib/asn1.c
index 0c9d09a..03b5662 100644
--- a/contrib/bsnmp/lib/asn1.c
+++ b/contrib/bsnmp/lib/asn1.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -285,7 +285,7 @@ asn_put_real_integer(struct asn_buf *b, u_char type, int64_t ival)
 	enum asn_err ret;
 
 	if (ival < 0) {
-		/* this may fail if |INT64_MIN| > |INT64_MAX| and 
+		/* this may fail if |INT64_MIN| > |INT64_MAX| and
 		 * the value is between * INT64_MIN <= ival < -(INT64_MAX+1) */
 		val = (uint64_t)-(ival + 1);
 		neg = 1;
@@ -890,7 +890,7 @@ asn_slice_oid(struct asn_oid *dest, const struct asn_oid *src,
 	memcpy(dest->subs, &src->subs[from], dest->len * sizeof(dest->subs[0]));
 }
 
-/* 
+/*
  * Append from to to
  */
 void
diff --git a/contrib/bsnmp/lib/asn1.h b/contrib/bsnmp/lib/asn1.h
index cf9a727..4aded8a 100644
--- a/contrib/bsnmp/lib/asn1.h
+++ b/contrib/bsnmp/lib/asn1.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/bsnmpagent.3 b/contrib/bsnmp/lib/bsnmpagent.3
index 6b9c719..f9f2a7c 100644
--- a/contrib/bsnmp/lib/bsnmpagent.3
+++ b/contrib/bsnmp/lib/bsnmpagent.3
@@ -7,7 +7,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/bsnmpclient.3 b/contrib/bsnmp/lib/bsnmpclient.3
index d4af60e..7a13a89 100644
--- a/contrib/bsnmp/lib/bsnmpclient.3
+++ b/contrib/bsnmp/lib/bsnmpclient.3
@@ -7,7 +7,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/bsnmplib.3 b/contrib/bsnmp/lib/bsnmplib.3
index 12d676a..76b4bd4 100644
--- a/contrib/bsnmp/lib/bsnmplib.3
+++ b/contrib/bsnmp/lib/bsnmplib.3
@@ -13,7 +13,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -22,7 +22,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/snmp.c b/contrib/bsnmp/lib/snmp.c
index 5354443..339853b 100644
--- a/contrib/bsnmp/lib/snmp.c
+++ b/contrib/bsnmp/lib/snmp.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -19,7 +19,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -682,7 +682,7 @@ snmp_pdu_snoop(const struct asn_buf *b0)
 	struct asn_buf b = *b0;
 
 	/* <0x10|0x20> <len> <data...> */
-	
+
 	if (b.asn_len == 0)
 		return (0);
 	if (b.asn_cptr[0] != (ASN_TYPE_SEQUENCE | ASN_TYPE_CONSTRUCTED)) {
@@ -757,7 +757,7 @@ snmp_pdu_encode_header(struct asn_buf *b, struct snmp_pdu *pdu)
 		if (asn_put_temp_header(b, (ASN_TYPE_SEQUENCE |
 		    ASN_TYPE_CONSTRUCTED), &v3_hdr_ptr) != ASN_ERR_OK)
 			return (SNMP_CODE_FAILED);
-	
+
 		if (asn_put_integer(b, pdu->identifier) != ASN_ERR_OK)
 			return (SNMP_CODE_FAILED);
 
diff --git a/contrib/bsnmp/lib/snmp.h b/contrib/bsnmp/lib/snmp.h
index 4657336..61e783e 100644
--- a/contrib/bsnmp/lib/snmp.h
+++ b/contrib/bsnmp/lib/snmp.h
@@ -4,14 +4,14 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by Shteryana Sotirova Shopova
  * under sponsorship from the FreeBSD Foundation.
  *
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -20,7 +20,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/snmpagent.c b/contrib/bsnmp/lib/snmpagent.c
index a425c37..8393aec 100644
--- a/contrib/bsnmp/lib/snmpagent.c
+++ b/contrib/bsnmp/lib/snmpagent.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -515,7 +515,7 @@ snmp_getbulk(struct snmp_pdu *pdu, struct asn_buf *resp_b,
 				/* PDU is full */
 				goto done;
 
-			if (cnt == 0) 
+			if (cnt == 0)
 				result = do_getnext(&context, &pdu->bindings[i],
 				    &resp->bindings[resp->nbindings], pdu);
 			else
@@ -689,7 +689,7 @@ snmp_set(struct snmp_pdu *pdu, struct asn_buf *resp_b,
 	if (snmp_pdu_encode_header(resp_b, resp))
 		return (SNMP_RET_IGN);
 
-	/* 
+	/*
 	 * 1. Find all nodes, check that they are writeable and
 	 *    that the syntax is ok, copy over the binding to the response.
 	 */
@@ -967,7 +967,7 @@ snmp_dep_lookup(struct snmp_context *ctx, const struct asn_oid *obj,
 /*
  * Make an error response from a PDU. We do this without decoding the
  * variable bindings. This means we can sent the junk back to a caller
- * that has sent us junk in the first place. 
+ * that has sent us junk in the first place.
  */
 enum snmp_ret
 snmp_make_errresp(const struct snmp_pdu *pdu, struct asn_buf *pdu_b,
diff --git a/contrib/bsnmp/lib/snmpagent.h b/contrib/bsnmp/lib/snmpagent.h
index 66019c9..204b517 100644
--- a/contrib/bsnmp/lib/snmpagent.h
+++ b/contrib/bsnmp/lib/snmpagent.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/snmpclient.c b/contrib/bsnmp/lib/snmpclient.c
index f4329ef..54ab9e3 100644
--- a/contrib/bsnmp/lib/snmpclient.c
+++ b/contrib/bsnmp/lib/snmpclient.c
@@ -68,7 +68,7 @@
 struct snmp_client snmp_client;
 
 /* List of all outstanding requests */
-struct sent_pdu {	
+struct sent_pdu {
 	int		reqid;
 	struct snmp_pdu	*pdu;
 	struct timeval	time;
@@ -510,7 +510,7 @@ table_check_response(struct tabwork *work, const struct snmp_pdu *resp)
 				table_free(work, 1);
 				return (-2);
 			}
-					
+
 			continue;
 		}
 		if (!asn_is_suboid(&work->descr->table, &b->var) ||
@@ -754,7 +754,7 @@ snmp_oid_append(struct asn_oid *oid, const char *fmt, ...)
 	ret = 0;
 	while (*fmt != '\0') {
 		switch (*fmt++) {
-		  case 'i': 
+		  case 'i':
 			/* just an integer more */
 			if (oid->len + 1 > ASN_MAXOIDLEN) {
 				warnx("%s: OID too long for integer", __func__);
@@ -804,7 +804,7 @@ snmp_oid_append(struct asn_oid *oid, const char *fmt, ...)
 			break;
 
 		  case 'b':
-			/* append `size` characters */ 
+			/* append `size` characters */
 			str = (const u_char *)va_arg(va, const char *);
 			if (oid->len + size > ASN_MAXOIDLEN) {
 				warnx("%s: OID too long for string", __func__);
@@ -852,7 +852,7 @@ snmp_client_init(struct snmp_client *c)
 
 	strcpy(c->read_community, "public");
 	strcpy(c->write_community, "private");
-	
+
 	c->security_model = SNMP_SECMODEL_USM;
 	strcpy(c->cname, "");
 
@@ -863,7 +863,7 @@ snmp_client_init(struct snmp_client *c)
 	c->txbuflen = c->rxbuflen = 10000;
 
 	c->fd = -1;
-	
+
 	c->max_reqid = INT32_MAX;
 	c->min_reqid = 0;
 	c->next_reqid = 0;
diff --git a/contrib/bsnmp/lib/snmpclient.h b/contrib/bsnmp/lib/snmpclient.h
index 619f726..e7454b1 100644
--- a/contrib/bsnmp/lib/snmpclient.h
+++ b/contrib/bsnmp/lib/snmpclient.h
@@ -5,7 +5,7 @@
  *
  * Author: Harti Brandt <harti@freebsd.org>
  *	   Kendy Kutzner
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -14,7 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -59,7 +59,7 @@ typedef void (*snmp_send_cb_f)(struct snmp_pdu *, struct snmp_pdu *, void *);
 typedef void (*snmp_timeout_cb_f)(void * );
 
 /* timeout start function */
-typedef void *(*snmp_timeout_start_f)(struct timeval *timeout,  
+typedef void *(*snmp_timeout_start_f)(struct timeval *timeout,
     snmp_timeout_cb_f callback, void *);
 
 /* timeout stop function */
diff --git a/contrib/bsnmp/lib/snmpcrypto.c b/contrib/bsnmp/lib/snmpcrypto.c
index 05860d6..82c8660 100644
--- a/contrib/bsnmp/lib/snmpcrypto.c
+++ b/contrib/bsnmp/lib/snmpcrypto.c
@@ -322,7 +322,7 @@ snmp_calc_keychange(struct snmp_user *user, uint8_t *keychange)
 
 	for (i = 0; i < keylen / 4; i++)
 		rvalue[i] = random();
-	
+
 	memcpy(keychange, user->auth_key, keylen);
 	memcpy(keychange + keylen, rvalue, keylen);
 
diff --git a/contrib/bsnmp/lib/snmppriv.h b/contrib/bsnmp/lib/snmppriv.h
index c0e4479..5b66992 100644
--- a/contrib/bsnmp/lib/snmppriv.h
+++ b/contrib/bsnmp/lib/snmppriv.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/support.c b/contrib/bsnmp/lib/support.c
index 391c152..6a759b3 100644
--- a/contrib/bsnmp/lib/support.c
+++ b/contrib/bsnmp/lib/support.c
@@ -1,10 +1,10 @@
-/* 
+/*
  * Copyright (C) 2004
  * 	Hartmut Brandt.
  * 	All rights reserved.
- * 
+ *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/lib/support.h b/contrib/bsnmp/lib/support.h
index 415c85b..29dbe4d 100644
--- a/contrib/bsnmp/lib/support.h
+++ b/contrib/bsnmp/lib/support.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c
index 9079d1d..3656541 100644
--- a/contrib/bsnmp/snmp_mibII/mibII.c
+++ b/contrib/bsnmp/snmp_mibII/mibII.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1228,7 +1228,7 @@ mib_fetch_rtab(int af, int info, int arg, size_t *lenp)
 			return (NULL);
 		}
 		buf = newbuf;
-			
+
 		if (sysctl(name, 6, buf, lenp, NULL, 0) == 0)
 			break;
 
@@ -1329,7 +1329,7 @@ mib_arp_update(void)
 		in_update_arp = 0;
 		return;
 	}
-	
+
 	next = buf;
 	while (next < buf + needed) {
 		rtm = (struct rt_msghdr *)(void *)next;
@@ -1521,7 +1521,7 @@ mib_unmodify_ifa(struct mibifa *ifa)
 }
 
 /*
- * Modify an IFA. 
+ * Modify an IFA.
  */
 int
 mib_modify_ifa(struct mibifa *ifa)
diff --git a/contrib/bsnmp/snmp_mibII/mibII.h b/contrib/bsnmp/snmp_mibII/mibII.h
index f7b230d..4d82530 100644
--- a/contrib/bsnmp/snmp_mibII/mibII.h
+++ b/contrib/bsnmp/snmp_mibII/mibII.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_begemot.c b/contrib/bsnmp/snmp_mibII/mibII_begemot.c
index b502e95..6937e4c 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_begemot.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_begemot.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ifmib.c b/contrib/bsnmp/snmp_mibII/mibII_ifmib.c
index fb2c620..7eb01c4 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_ifmib.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_ifmib.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ifstack.c b/contrib/bsnmp/snmp_mibII/mibII_ifstack.c
index ac3ffeb..38c07c2 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_ifstack.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_ifstack.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
index 9bd7942..c0f61c7 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ip.c b/contrib/bsnmp/snmp_mibII/mibII_ip.c
index 1e33dc9..8290eeb 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_ip.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_ip.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c b/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c
index d1821ec..ecf67f2 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c b/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c
index 91c9d03..0a05859 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c b/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c
index 616732f..693901a 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_route.c b/contrib/bsnmp/snmp_mibII/mibII_route.c
index 710ae86..2d449a3 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_route.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_route.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -257,7 +257,7 @@ mib_fetch_route(void)
 			continue;
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
 
-		
+
 		mib_sroute_process(rtm, addrs[RTAX_GATEWAY], addrs[RTAX_DST],
 		    addrs[RTAX_NETMASK]);
 	}
diff --git a/contrib/bsnmp/snmp_mibII/mibII_tcp.c b/contrib/bsnmp/snmp_mibII/mibII_tcp.c
index a61052d..d208f10 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_tcp.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_tcp.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_tree.def b/contrib/bsnmp/snmp_mibII/mibII_tree.def
index d377538..5a2abb7 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_tree.def
+++ b/contrib/bsnmp/snmp_mibII/mibII_tree.def
@@ -4,7 +4,7 @@
 #	All rights reserved.
 #
 # Author: Harti Brandt <harti@freebsd.org>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/mibII_udp.c b/contrib/bsnmp/snmp_mibII/mibII_udp.c
index 08e3dd1..5682974 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_udp.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_udp.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.3 b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
index d1b5ec3..36653e6 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.3
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
@@ -7,7 +7,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.h b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
index 91e552e..5df80c8 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.h
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_ntp/NTP-MIB.txt b/contrib/bsnmp/snmp_ntp/NTP-MIB.txt
index ef51470..37418a7 100644
--- a/contrib/bsnmp/snmp_ntp/NTP-MIB.txt
+++ b/contrib/bsnmp/snmp_ntp/NTP-MIB.txt
@@ -5,7 +5,7 @@
 NTP-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
-    Integer32, IpAddress, MODULE-IDENTITY, OBJECT-TYPE, Unsigned32, 
+    Integer32, IpAddress, MODULE-IDENTITY, OBJECT-TYPE, Unsigned32,
     enterprises
         FROM SNMPv2-SMI
 
@@ -14,9 +14,9 @@ IMPORTS
 
 ntpMIB MODULE-IDENTITY
     LAST-UPDATED "199707251530Z"
-    ORGANIZATION 
+    ORGANIZATION
         "University of Delaware"
-    CONTACT-INFO 
+    CONTACT-INFO
         "Adarsh Sethi
          Department of Computer & Information Sciences
          University of Delaware
@@ -30,7 +30,7 @@ ntpMIB MODULE-IDENTITY
          Newark, DE 19716
          Tel: +1 302 831 ????
          E-mail: mills@ee.udel.edu"
-    DESCRIPTION 
+    DESCRIPTION
         "This MIB module defines a MIB which provides mechanisms to
          monitor and control an NTP server."
     ::= { udel 3 }
@@ -60,18 +60,18 @@ ntpFilter OBJECT IDENTIFIER
 NTPTimeStamp ::= TEXTUAL-CONVENTION
     DISPLAY-HINT "4x.4x"
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     SYNTAX      OCTET STRING (SIZE(8))
 
 NTPLeapIndicator ::= TEXTUAL-CONVENTION
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     SYNTAX      INTEGER {
 		    noWarning(0),
 		    addSecond(1),
-		    subtractSecond(2), 
+		    subtractSecond(2),
                     alarm(3) }
 
 --
@@ -82,7 +82,7 @@ ntpSysLeap OBJECT-TYPE
     SYNTAX      NTPLeapIndicator
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " two-bit code warning of an impending leap
          second to be inserted in the NTP timescale."
     ::= { ntpSystem 1 }
@@ -91,7 +91,7 @@ ntpSysStratum OBJECT-TYPE
     SYNTAX      Integer32 (0..255)
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " indicating the stratum of the local clock.
          0, unspecified
          1, primary reference (e.g.,, calibrated atomic clock,
@@ -103,7 +103,7 @@ ntpSysPrecision OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "signed integer indicating the precision
          of the various clocks, in seconds to the nearest power
          of two."
@@ -113,7 +113,7 @@ ntpSysRootDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the total roundtrip delay to the primary
          reference source at the root of the synchronization
          subnet, in seconds"
@@ -123,7 +123,7 @@ ntpSysRootDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the maximum error relative to the primary
          reference source at the root of the synchronization
          subnet, in seconds. Only positive values greater
@@ -134,7 +134,7 @@ ntpSysRefId OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the particular reference clock. In the case of
          stratum 0 (unspecified) or stratum 1 (primary reference
          source), this is a four-octet, left-justified,zero-padded
@@ -147,7 +147,7 @@ ntpSysRefTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the local time when the local clock was last
          updated. If the local clock has neverbeen synchronized,
          the value is zero."
@@ -157,7 +157,7 @@ ntpSysPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the minimum interval between transmitted
          messages, in seconds as a power of two. For instance,
          a value of six indicates a minimum interval of 64 seconds."
@@ -167,7 +167,7 @@ ntpSysPeer OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the current synchronization source. Usually
          this will be a pointer to a structure containing the peer
          variables. The special value NULL indicates there is no
@@ -178,7 +178,7 @@ ntpSysPhase OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpSystem 10 }
 
@@ -186,7 +186,7 @@ ntpSysFreq OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpSystem 11 }
 
@@ -194,7 +194,7 @@ ntpSysError OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpSystem 12 }
 
@@ -202,7 +202,7 @@ ntpSysClock OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the current local time. Local time is derived
          from the hardware clock of the particular machine and
          increments at intervals depending on the design used."
@@ -212,7 +212,7 @@ ntpSysSystem OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the type of the local Operating System"
     ::= { ntpSystem 14 }
 
@@ -220,7 +220,7 @@ ntpSysProcessor OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the type of the local Processor"
     ::= { ntpSystem 15 }
 
@@ -236,7 +236,7 @@ ntpPeersVarTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeers 1 }
 
@@ -244,7 +244,7 @@ ntpPeersVarEntry OBJECT-TYPE
     SYNTAX      NtpPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     INDEX       { ntpPeersAssocId }
     ::= { ntpPeersVarTable 1 }
@@ -281,7 +281,7 @@ ntpPeersAssocId OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeersVarEntry 1 }
 
@@ -289,7 +289,7 @@ ntpPeersConfigured OBJECT-TYPE
     SYNTAX      TruthValue
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " This is a bit indicating that the association
          was created from configuration information and should not
          be demobilized if the peer becomes unreachable."
@@ -299,7 +299,7 @@ ntpPeersPeerAddress OBJECT-TYPE
     SYNTAX      IpAddress
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the Internet address of the peer"
     ::= { ntpPeersVarEntry 3 }
 
@@ -307,7 +307,7 @@ ntpPeersPeerPort OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " 16-bit port number of the peer."
     ::= { ntpPeersVarEntry 4 }
 
@@ -315,7 +315,7 @@ ntpPeersHostAddress OBJECT-TYPE
     SYNTAX      IpAddress
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the Internet address of the host"
     ::= { ntpPeersVarEntry 5 }
 
@@ -323,7 +323,7 @@ ntpPeersHostPort OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " 16-bit port number of the host"
     ::= { ntpPeersVarEntry 6 }
 
@@ -331,7 +331,7 @@ ntpPeersLeap OBJECT-TYPE
     SYNTAX      NTPLeapIndicator
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " two-bit code warning of an impending leap
          second to be inserted in the NTP timescale."
     ::= { ntpPeersVarEntry 7 }
@@ -339,17 +339,17 @@ ntpPeersLeap OBJECT-TYPE
 ntpPeersMode OBJECT-TYPE
     SYNTAX      INTEGER {
 		   unspecified(0),
-		   symmetricActive(1), 
+		   symmetricActive(1),
                    symmetricPassive(2),
 		   client(3),
-		   server(4), 
+		   server(4),
                    broadcast(5),
 		   reservedControl(6),
 		   reservedPrivate(7)
 		}
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the association mode,with values coded as
          follows:
          0, unspecified
@@ -367,7 +367,7 @@ ntpPeersStratum OBJECT-TYPE
     SYNTAX      Integer32 (0..255)
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " indicating the stratum of the peer clock.
          0, unspecified
          1, primary reference (e.g.,, calibrated atomic clock,
@@ -379,7 +379,7 @@ ntpPeersPeerPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "poll interval of the peer"
     ::= { ntpPeersVarEntry 10 }
 
@@ -387,7 +387,7 @@ ntpPeersHostPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "poll interval of the host"
     ::= { ntpPeersVarEntry 11 }
 
@@ -395,7 +395,7 @@ ntpPeersPrecision OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the same as the systemPrecision except this is
          for the peer"
     ::= { ntpPeersVarEntry 12 }
@@ -404,7 +404,7 @@ ntpPeersRootDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the same as the systemRootDealy except this is for
          the peer"
     ::= { ntpPeersVarEntry 13 }
@@ -413,7 +413,7 @@ ntpPeersRootDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the same as the systemDispersion except this is for
          the peer"
     ::= { ntpPeersVarEntry 14 }
@@ -422,7 +422,7 @@ ntpPeersRefId OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the same as the systemRefid except this is for
          the peer"
     ::= { ntpPeersVarEntry 15 }
@@ -431,7 +431,7 @@ ntpPeersRefTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the same as the systemRefTime except this is for
          the peer"
     ::= { ntpPeersVarEntry 16 }
@@ -440,7 +440,7 @@ ntpPeersOrgTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " the local time at the peer when its latest
          NTP message was sent. If the peer becomes unreachable the
          value is set to zero."
@@ -450,7 +450,7 @@ ntpPeersReceiveTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the local time when the latest NTP message
          from the peer arrived. If the peer becomes unreachable the
          value is set to zero."
@@ -460,7 +460,7 @@ ntpPeersTransmitTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the local time at which the NTP message
          departed the sender."
     ::= { ntpPeersVarEntry 19 }
@@ -469,7 +469,7 @@ ntpPeersUpdateTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         " "
     ::= { ntpPeersVarEntry 20 }
 
@@ -477,7 +477,7 @@ ntpPeersReach OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "a shift register of NTP.WINDOW bits used to determine
          the reachability status of the peer, with bits entering
          from the least significant (rightmost) end. A peer is
@@ -489,7 +489,7 @@ ntpPeersTimer OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeersVarEntry 22 }
 
@@ -497,7 +497,7 @@ ntpPeersOffset OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeersVarEntry 23 }
 
@@ -505,7 +505,7 @@ ntpPeersDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeersVarEntry 24 }
 
@@ -513,7 +513,7 @@ ntpPeersDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpPeersVarEntry 25 }
 
@@ -532,7 +532,7 @@ ntpFilterPeersVarTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpFilterPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "This table is an extension of the Peer Variables Table
          in the Peer Group."
     ::= { ntpFilter 1 }
@@ -541,7 +541,7 @@ ntpFilterPeersVarEntry OBJECT-TYPE
     SYNTAX      NtpFilterPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     AUGMENTS    { ntpPeersVarEntry }
     ::= { ntpFilterPeersVarTable 1 }
@@ -554,7 +554,7 @@ ntpFilterValidEntries OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "The number of valid entries for a peer in the Filter Register Table."
     ::= { ntpFilterPeersVarEntry 1 }
 
@@ -566,7 +566,7 @@ ntpFilterRegisterTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpFilterRegisterEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpFilter 2 }
 
@@ -574,7 +574,7 @@ ntpFilterRegisterEntry OBJECT-TYPE
     SYNTAX      NtpFilterRegisterEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     INDEX       { ntpPeersAssocId, ntpFilterIndex }
     ::= { ntpFilterRegisterTable 1 }
@@ -590,7 +590,7 @@ ntpFilterIndex OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpFilterRegisterEntry 1 }
 
@@ -598,7 +598,7 @@ ntpFilterPeersOffset OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the offset of the peer clock relative to the
          local clock in seconds"
     ::= { ntpFilterRegisterEntry 2 }
@@ -607,7 +607,7 @@ ntpFilterPeersDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "roundtrip delay of the peer clock relative to the
          local clock over the network path between them, in seconds.
          this variable can take on both positive and negative values,
@@ -618,7 +618,7 @@ ntpFilterPeersDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "the maximum error of the peer clock relative to the
          local clock over the network path between them, in seconds.
          Only positive values greater than zero are possible."
diff --git a/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt b/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt
index 233dfec..a356992 100644
--- a/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt
+++ b/contrib/bsnmp/snmp_ntp/NTP-PROXY-MIB.txt
@@ -8,7 +8,7 @@ IMPORTS
     NTPLeapIndicator, NTPTimeStamp
         FROM NTP-MIB
 
-    Integer32, IpAddress, MODULE-IDENTITY, OBJECT-TYPE, Unsigned32, 
+    Integer32, IpAddress, MODULE-IDENTITY, OBJECT-TYPE, Unsigned32,
     enterprises
         FROM SNMPv2-SMI
 
@@ -17,23 +17,23 @@ IMPORTS
 
 ntpProxyMIB MODULE-IDENTITY
     LAST-UPDATED "199707251540Z"
-    ORGANIZATION 
+    ORGANIZATION
         "University of Delaware"
-    CONTACT-INFO 
+    CONTACT-INFO
         "Adarsh Sethi
          Department of Computer & Information Sciences
          University of Delaware
          Newark, DE 19716
          Tel: +1 302 831 1945
          E-mail: sethi@cis.udel.edu
-         
+
          David Mills
          Department of Electrical Engineering
          University of Delaware
          Newark, DE 19716
          Tel: +1 302 831 ????
          E-mail: mills@ee.udel.edu"
-    DESCRIPTION 
+    DESCRIPTION
         "This MIB module defines a MIB which provides mechanisms to
          monitor and control many NTP servers via a Proxy Agent."
     ::= { enterprises 1277 4 }
@@ -58,7 +58,7 @@ ntpProxyControl OBJECT IDENTIFIER
 
 NTPRowStatus ::= TEXTUAL-CONVENTION
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "The NTPRowStatus textual convention is modeled after the
          RowStatus textual convention of RFC 1903, but is simpler
          because it only allows one create operation (the create-
@@ -81,7 +81,7 @@ NTPRowStatus ::= TEXTUAL-CONVENTION
 		   create(3)
 		}
 
--- 
+--
 -- Control group
 --
 
@@ -93,7 +93,7 @@ ntpProxyControlTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpProxyControlEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControl 1 }
 
@@ -101,7 +101,7 @@ ntpProxyControlEntry OBJECT-TYPE
     SYNTAX      NtpProxyControlEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     INDEX       { ntpProxyServerIPAddr }
     ::= { ntpProxyControlTable 1 }
@@ -115,7 +115,7 @@ ntpProxyServerIPAddr OBJECT-TYPE
     SYNTAX      IpAddress
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControlEntry 1 }
 
@@ -123,7 +123,7 @@ ntpProxyControlStatus OBJECT-TYPE
     SYNTAX      NTPRowStatus
     MAX-ACCESS  read-create
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControlEntry 2 }
 
@@ -135,7 +135,7 @@ ntpProxyServerSystemTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpProxyServerSystemEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControl 2 }
 
@@ -143,7 +143,7 @@ ntpProxyServerSystemEntry OBJECT-TYPE
     SYNTAX      NtpProxyServerSystemEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     INDEX       { ntpProxyServerIPAddr }
     ::= { ntpProxyServerSystemTable 1 }
@@ -170,7 +170,7 @@ ntpProxyServerSysLeap OBJECT-TYPE
     SYNTAX      NTPLeapIndicator
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 1 }
 
@@ -178,7 +178,7 @@ ntpProxyServerSysStratum OBJECT-TYPE
     SYNTAX      Integer32 (0..255)
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 2 }
 
@@ -186,7 +186,7 @@ ntpProxyServerSysPrecision OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 3 }
 
@@ -194,7 +194,7 @@ ntpProxyServerSysRootDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 4 }
 
@@ -202,7 +202,7 @@ ntpProxyServerSysRootDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 5 }
 
@@ -210,7 +210,7 @@ ntpProxyServerSysRefId OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 6 }
 
@@ -218,7 +218,7 @@ ntpProxyServerSysRefTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 7 }
 
@@ -226,7 +226,7 @@ ntpProxyServerSysPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 8 }
 
@@ -234,7 +234,7 @@ ntpProxyServerSysPeer OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 9 }
 
@@ -242,7 +242,7 @@ ntpProxyServerSysPhase OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 10 }
 
@@ -250,7 +250,7 @@ ntpProxyServerSysFreq OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 11 }
 
@@ -258,7 +258,7 @@ ntpProxyServerSysError OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 12 }
 
@@ -266,7 +266,7 @@ ntpProxyServerSysClock OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 13 }
 
@@ -274,7 +274,7 @@ ntpProxyServerSysSystem OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 14 }
 
@@ -282,7 +282,7 @@ ntpProxyServerSysProcessor OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyServerSystemEntry 15 }
 
@@ -293,7 +293,7 @@ ntpProxyPeersVarTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpProxyPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControl 3 }
 
@@ -301,7 +301,7 @@ ntpProxyPeersVarEntry OBJECT-TYPE
     SYNTAX      NtpProxyPeersVarEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     INDEX       { ntpProxyServerIPAddr, ntpProxyPeersAssocId }
     ::= { ntpProxyPeersVarTable 1 }
@@ -339,7 +339,7 @@ ntpProxyPeersAssocId OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 1 }
 
@@ -347,7 +347,7 @@ ntpProxyPeersConfigured OBJECT-TYPE
     SYNTAX      TruthValue
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 2 }
 
@@ -355,7 +355,7 @@ ntpProxyPeersPeerAddress OBJECT-TYPE
     SYNTAX      IpAddress
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 3 }
 
@@ -363,7 +363,7 @@ ntpProxyPeersPeerPort OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 4 }
 
@@ -371,7 +371,7 @@ ntpProxyPeersHostAddress OBJECT-TYPE
     SYNTAX      IpAddress
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 5 }
 
@@ -379,7 +379,7 @@ ntpProxyPeersHostPort OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 6 }
 
@@ -387,23 +387,23 @@ ntpProxyPeersLeap OBJECT-TYPE
     SYNTAX      NTPLeapIndicator
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 7 }
 
 ntpProxyPeersMode OBJECT-TYPE
     SYNTAX      INTEGER {
 		   unspecified(0),
-		   symmetricActive(1), 
+		   symmetricActive(1),
                    symmetricPassive(2),
 		   client(3),
-		   server(4), 
+		   server(4),
                    broadcast(5),
 		   reservedControl(6),
 		   reservedPrivate(7) }
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 8 }
 
@@ -411,7 +411,7 @@ ntpProxyPeersStratum OBJECT-TYPE
     SYNTAX      Integer32 (0..255)
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 9 }
 
@@ -419,7 +419,7 @@ ntpProxyPeersPeerPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 10 }
 
@@ -427,7 +427,7 @@ ntpProxyPeersHostPoll OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 11 }
 
@@ -435,7 +435,7 @@ ntpProxyPeersPrecision OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 12 }
 
@@ -443,7 +443,7 @@ ntpProxyPeersRootDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 13 }
 
@@ -451,7 +451,7 @@ ntpProxyPeersRootDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 14 }
 
@@ -459,7 +459,7 @@ ntpProxyPeersRefId OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 15 }
 
@@ -467,7 +467,7 @@ ntpProxyPeersRefTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 16 }
 
@@ -475,7 +475,7 @@ ntpProxyPeersOrgTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 17 }
 
@@ -483,7 +483,7 @@ ntpProxyPeersReceiveTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 18 }
 
@@ -491,7 +491,7 @@ ntpProxyPeersTransmitTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 19 }
 
@@ -499,7 +499,7 @@ ntpProxyPeersUpdateTime OBJECT-TYPE
     SYNTAX      NTPTimeStamp
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 20 }
 
@@ -507,7 +507,7 @@ ntpProxyPeersReach OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 21 }
 
@@ -515,7 +515,7 @@ ntpProxyPeersTimer OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 22 }
 
@@ -523,7 +523,7 @@ ntpProxyPeersOffset OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 23 }
 
@@ -531,7 +531,7 @@ ntpProxyPeersDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 24 }
 
@@ -539,7 +539,7 @@ ntpProxyPeersDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyPeersVarEntry 25 }
 
@@ -547,7 +547,7 @@ ntpProxyPeersFilterValidEntries OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         "The number of valid entries for a peer in the Proxy Filter
          Register Table. This number can be zero."
     ::= { ntpProxyPeersVarEntry 26 }
@@ -560,7 +560,7 @@ ntpProxyFilterRegisterTable OBJECT-TYPE
     SYNTAX      SEQUENCE OF NtpProxyFilterRegisterEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyControl 4 }
 
@@ -568,9 +568,9 @@ ntpProxyFilterRegisterEntry OBJECT-TYPE
     SYNTAX      NtpProxyFilterRegisterEntry
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
-    INDEX       { ntpProxyServerIPAddr, ntpProxyPeersAssocId, 
+    INDEX       { ntpProxyServerIPAddr, ntpProxyPeersAssocId,
                   ntpProxyFilterIndex }
     ::= { ntpProxyFilterRegisterTable 1 }
 
@@ -585,7 +585,7 @@ ntpProxyFilterIndex OBJECT-TYPE
     SYNTAX      Unsigned32
     MAX-ACCESS  not-accessible
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyFilterRegisterEntry 1 }
 
@@ -593,7 +593,7 @@ ntpProxyFilterPeersOffset OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyFilterRegisterEntry 2 }
 
@@ -601,7 +601,7 @@ ntpProxyFilterPeersDelay OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyFilterRegisterEntry 3 }
 
@@ -609,7 +609,7 @@ ntpProxyFilterPeersDispersion OBJECT-TYPE
     SYNTAX      OCTET STRING
     MAX-ACCESS  read-only
     STATUS      current
-    DESCRIPTION 
+    DESCRIPTION
         ""
     ::= { ntpProxyFilterRegisterEntry 4 }
 
diff --git a/contrib/bsnmp/snmp_target/snmp_target.3 b/contrib/bsnmp/snmp_target/snmp_target.3
index 626bb78..c9e01a3 100644
--- a/contrib/bsnmp/snmp_target/snmp_target.3
+++ b/contrib/bsnmp/snmp_target/snmp_target.3
@@ -1,7 +1,7 @@
 .\"-
 .\" Copyright (C) 2010 The FreeBSD Foundation
 .\" All rights reserved.
-.\" 
+.\"
 .\" This documentation was written by Shteryana Sotirova Shopova under
 .\" sponsorship from the FreeBSD Foundation.
 .\"
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_usm/snmp_usm.3 b/contrib/bsnmp/snmp_usm/snmp_usm.3
index ceb62e4..03959ed 100644
--- a/contrib/bsnmp/snmp_usm/snmp_usm.3
+++ b/contrib/bsnmp/snmp_usm/snmp_usm.3
@@ -1,7 +1,7 @@
 .\"-
 .\" Copyright (C) 2010 The FreeBSD Foundation
 .\" All rights reserved.
-.\" 
+.\"
 .\" This documentation was written by Shteryana Sotirova Shopova under
 .\" sponsorship from the FreeBSD Foundation.
 .\"
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_usm/usm_snmp.c b/contrib/bsnmp/snmp_usm/usm_snmp.c
index 6b7d0eb..c475940 100644
--- a/contrib/bsnmp/snmp_usm/usm_snmp.c
+++ b/contrib/bsnmp/snmp_usm/usm_snmp.c
@@ -179,7 +179,7 @@ op_usm_users(struct snmp_context *ctx, struct snmp_value *val,
 
 		case LEAF_usmUserCloneFrom:
 			if (uuser != NULL || usm_user_index_decode(&val->var,
-			    sub, eid, &elen, uname) < 0 || 
+			    sub, eid, &elen, uname) < 0 ||
 			    !(asn_is_suboid(&oid_usmUserSecurityName, &val->v.oid)))
 				return (SNMP_ERR_WRONG_VALUE);
 			if ((clone = usm_get_user(&val->v.oid, sub)) == NULL)
@@ -311,7 +311,7 @@ op_usm_users(struct snmp_context *ctx, struct snmp_value *val,
 			} else if (val->v.integer != RowStatus_active &&
 			    val->v.integer != RowStatus_destroy)
 				return (SNMP_ERR_INCONS_VALUE);
-			
+
 			uuser->status = val->v.integer;
 			break;
 		}
@@ -381,7 +381,7 @@ op_usm_users(struct snmp_context *ctx, struct snmp_value *val,
 				usm_delete_user(uuser);
 			break;
 		default:
-			break;	
+			break;
 		}
 		return (SNMP_ERR_NOERROR);
 
diff --git a/contrib/bsnmp/snmp_vacm/snmp_vacm.3 b/contrib/bsnmp/snmp_vacm/snmp_vacm.3
index dd57f7f..e1213d9 100644
--- a/contrib/bsnmp/snmp_vacm/snmp_vacm.3
+++ b/contrib/bsnmp/snmp_vacm/snmp_vacm.3
@@ -1,7 +1,7 @@
 .\"-
 .\" Copyright (C) 2010 The FreeBSD Foundation
 .\" All rights reserved.
-.\" 
+.\"
 .\" This documentation was written by Shteryana Sotirova Shopova under
 .\" sponsorship from the FreeBSD Foundation.
 .\"
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmp_vacm/vacm_snmp.c b/contrib/bsnmp/snmp_vacm/vacm_snmp.c
index cdec9f4..61142af 100644
--- a/contrib/bsnmp/snmp_vacm/vacm_snmp.c
+++ b/contrib/bsnmp/snmp_vacm/vacm_snmp.c
@@ -578,7 +578,7 @@ op_vacm_view(struct snmp_context *ctx, struct snmp_value *val, uint32_t sub,
 				return (vacm_delete_view(view));
 			break;
 		default:
-			break;	
+			break;
 		}
 		return (SNMP_ERR_NOERROR);
 
@@ -683,7 +683,7 @@ vacm_append_access_rule_index(struct asn_oid *oid, uint sub,
     const struct vacm_access *acl)
 {
 	uint32_t i;
-  
+
 	oid->len = sub + strlen(acl->group->groupname) +
 	    strlen(acl->ctx_prefix) + 4;
 
@@ -776,7 +776,7 @@ vacm_get_next_access_rule(const struct asn_oid *oid __unused, uint sub __unused)
 static int
 vacm_view_index_decode(const struct asn_oid *oid, uint sub, char *vname,
    struct asn_oid *view_oid)
-{	
+{
 	uint32_t i;
 	int viod_off;
 
diff --git a/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt b/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt
index 6f878ff..9d99eab 100644
--- a/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt
+++ b/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt
@@ -4,7 +4,7 @@
 --	All rights reserved.
 --
 -- Author: Harti Brandt <harti@freebsd.org>
--- 
+--
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
@@ -13,7 +13,7 @@
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
--- 
+--
 -- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt b/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
index 3262ada..d87e78e 100644
--- a/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
+++ b/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt
@@ -4,7 +4,7 @@
 --	All rights reserved.
 --
 -- Author: Harti Brandt <harti@freebsd.org>
--- 
+--
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
@@ -13,7 +13,7 @@
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
--- 
+--
 -- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/FOKUS-MIB.txt b/contrib/bsnmp/snmpd/FOKUS-MIB.txt
index 3f02f79..d4671e8 100644
--- a/contrib/bsnmp/snmpd/FOKUS-MIB.txt
+++ b/contrib/bsnmp/snmpd/FOKUS-MIB.txt
@@ -4,7 +4,7 @@
 --	All rights reserved.
 --
 -- Author: Harti Brandt <harti@freebsd.org>
--- 
+--
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
@@ -13,7 +13,7 @@
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
--- 
+--
 -- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/action.c b/contrib/bsnmp/snmpd/action.c
index c780466..4f6f817 100644
--- a/contrib/bsnmp/snmpd/action.c
+++ b/contrib/bsnmp/snmpd/action.c
@@ -7,7 +7,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -170,7 +170,7 @@ init_snmpd_engine(void)
 	} else {
 		memcpy(snmpd_engine.engine_id + snmpd_engine.engine_len,
 		    hostid, strlen(hostid));
-		snmpd_engine.engine_len += strlen(hostid);		
+		snmpd_engine.engine_len += strlen(hostid);
 	}
 
 	free(hostid);
@@ -1073,7 +1073,7 @@ op_snmp_engine(struct snmp_context *ctx __unused, struct snmp_value *value,
 			ctx->scratch->int1 = snmpd_engine.max_msg_size;
 			snmpd_engine.max_msg_size = value->v.integer;
 			break;
-	
+
 		default:
 			return (SNMP_ERR_NOT_WRITEABLE);
 		}
@@ -1103,7 +1103,7 @@ op_snmp_engine(struct snmp_context *ctx __unused, struct snmp_value *value,
 				snmpd_engine.engine_len = ctx->scratch->int1;
 				memcpy(snmpd_engine.engine_id,
 				    ctx->scratch->ptr1, ctx->scratch->int1);
-			}	
+			}
 			free(ctx->scratch->ptr1);
 		}
 		return (SNMP_ERR_NOERROR);
diff --git a/contrib/bsnmp/snmpd/config.c b/contrib/bsnmp/snmpd/config.c
index 23e97bd..231aeb5 100644
--- a/contrib/bsnmp/snmpd/config.c
+++ b/contrib/bsnmp/snmpd/config.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/export.c b/contrib/bsnmp/snmpd/export.c
index 08fb672..60c3523 100644
--- a/contrib/bsnmp/snmpd/export.c
+++ b/contrib/bsnmp/snmpd/export.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/main.c b/contrib/bsnmp/snmpd/main.c
index cd9f0a5..3c4ded4 100644
--- a/contrib/bsnmp/snmpd/main.c
+++ b/contrib/bsnmp/snmpd/main.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -19,7 +19,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/snmpd.config b/contrib/bsnmp/snmpd/snmpd.config
index 23db74c..2b93553 100644
--- a/contrib/bsnmp/snmpd/snmpd.config
+++ b/contrib/bsnmp/snmpd/snmpd.config
@@ -4,7 +4,7 @@
 #	All rights reserved.
 #
 # Author: Harti Brandt <harti@freebsd.org>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/snmpd.h b/contrib/bsnmp/snmpd/snmpd.h
index e4ec208..1ebb8c1 100644
--- a/contrib/bsnmp/snmpd/snmpd.h
+++ b/contrib/bsnmp/snmpd/snmpd.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/snmpd.sh b/contrib/bsnmp/snmpd/snmpd.sh
index d64efc5..8e3e07f 100755
--- a/contrib/bsnmp/snmpd/snmpd.sh
+++ b/contrib/bsnmp/snmpd/snmpd.sh
@@ -5,7 +5,7 @@
 #	All rights reserved.
 #
 # Author: Harti Brandt <harti@freebsd.org>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -14,7 +14,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/snmpmod.3 b/contrib/bsnmp/snmpd/snmpmod.3
index 38b3cf1..80a50fc 100644
--- a/contrib/bsnmp/snmpd/snmpmod.3
+++ b/contrib/bsnmp/snmpd/snmpmod.3
@@ -7,7 +7,7 @@
 .\"	All rights reserved.
 .\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -16,7 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/snmpmod.h b/contrib/bsnmp/snmpd/snmpmod.h
index ad73566..bc9e412 100644
--- a/contrib/bsnmp/snmpd/snmpmod.h
+++ b/contrib/bsnmp/snmpd/snmpmod.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -19,7 +19,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/trans_lsock.c b/contrib/bsnmp/snmpd/trans_lsock.c
index f9d4a32..1b4b2df 100644
--- a/contrib/bsnmp/snmpd/trans_lsock.c
+++ b/contrib/bsnmp/snmpd/trans_lsock.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/trans_lsock.h b/contrib/bsnmp/snmpd/trans_lsock.h
index 779f5ea..26e552e 100644
--- a/contrib/bsnmp/snmpd/trans_lsock.h
+++ b/contrib/bsnmp/snmpd/trans_lsock.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/trans_udp.c b/contrib/bsnmp/snmpd/trans_udp.c
index 3faef41..a41d3f0 100644
--- a/contrib/bsnmp/snmpd/trans_udp.c
+++ b/contrib/bsnmp/snmpd/trans_udp.c
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/trans_udp.h b/contrib/bsnmp/snmpd/trans_udp.h
index 29a96db..d383711 100644
--- a/contrib/bsnmp/snmpd/trans_udp.h
+++ b/contrib/bsnmp/snmpd/trans_udp.h
@@ -4,7 +4,7 @@
  *	All rights reserved.
  *
  * Author: Harti Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/trap.c b/contrib/bsnmp/snmpd/trap.c
index 80379a4..a0f95d2 100644
--- a/contrib/bsnmp/snmpd/trap.c
+++ b/contrib/bsnmp/snmpd/trap.c
@@ -19,7 +19,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/contrib/bsnmp/snmpd/tree.def b/contrib/bsnmp/snmpd/tree.def
index b45817f..eb8dac2 100644
--- a/contrib/bsnmp/snmpd/tree.def
+++ b/contrib/bsnmp/snmpd/tree.def
@@ -4,7 +4,7 @@
 #	All rights reserved.
 #
 # Author: Harti Brandt <harti@freebsd.org>
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -48,7 +48,7 @@ typedef RowStatus ENUM (
       (1 system
 #
 # The standard System group
-#	
+#
         (1 sysDescr OCTETSTRING op_system_group GET)
         (2 sysObjectId OID op_system_group GET)
         (3 sysUpTime TIMETICKS op_system_group GET)
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
index 83c4e5c..85339a3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
@@ -4,7 +4,7 @@
 -- 	All rights reserved.
 --
 -- Author: Hartmut Brandt <harti@freebsd.org>
--- 
+--
 -- Redistribution and use in source and binary forms, with or without
 -- modification, are permitted provided that the following conditions
 -- are met:
@@ -13,7 +13,7 @@
 -- 2. Redistributions in binary form must reproduce the above copyright
 --    notice, this list of conditions and the following disclaimer in the
 --    documentation and/or other materials provided with the distribution.
--- 
+--
 -- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 -- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 -- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -25,7 +25,7 @@
 -- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 -- SUCH DAMAGE.
---  
+--
 -- $FreeBSD$
 --
 -- Private Begemot MIB for ATM interfaces on FreeBSD
diff --git a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
index 525e805..c0699f7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
@@ -7,7 +7,7 @@
  *	All rights reserved.
  *
  * Author: Hartmut Brandt <harti@freebsd.org>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -16,7 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -215,7 +215,7 @@ atmif_sys_attach_if(struct atmif_priv *aif)
 	return (0);
 }
 
-/* 
+/*
  * Table of all ATM interfaces - Ng part
  */
 int
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
index 3fc6b0f..ba3ae49 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
@@ -111,7 +111,7 @@ begemotBridgePf			OBJECT IDENTIFIER ::= { begemotBridge 4 }
 begemotBridgeConfigObjects	OBJECT IDENTIFIER ::= { begemotBridge 5 }
 
 -- ---------------------------------------------------------- --
--- the base Bridge interface table 
+-- the base Bridge interface table
 -- ---------------------------------------------------------- --
 
 begemotBridgeBaseTable OBJECT-TYPE
@@ -180,7 +180,7 @@ begemotBridgeBaseType OBJECT-TYPE
 	perform."
     ::= { begemotBridgeBaseEntry 4 }
 
-begemotBridgeBaseStatus OBJECT-TYPE 
+begemotBridgeBaseStatus OBJECT-TYPE
     SYNTAX	RowStatus
     MAX-ACCESS	read-create
     STATUS	current
@@ -190,7 +190,7 @@ begemotBridgeBaseStatus OBJECT-TYPE
     ::= { begemotBridgeBaseEntry 5 }
 
 -- ---------------------------------------------------------- --
--- the base Bridge ports table 
+-- the base Bridge ports table
 -- ---------------------------------------------------------- --
 
 begemotBridgeBasePortTable OBJECT-TYPE
@@ -292,7 +292,7 @@ begemotBridgeBasePortPrivate OBJECT-TYPE
     ::= { begemotBridgeBasePortEntry 7 }
 
 -- ---------------------------------------------------------- --
--- the Bridge interface STP table 
+-- the Bridge interface STP table
 -- ---------------------------------------------------------- --
 
 begemotBridgeStpTable OBJECT-TYPE
@@ -529,7 +529,7 @@ begemotBridgeStpTxHoldCount OBJECT-TYPE
     ::= { begemotBridgeStpEntry 16 }
 
 -- ---------------------------------------------------------- --
--- the Bridge STP ports table 
+-- the Bridge STP ports table
 -- ---------------------------------------------------------- --
 
 begemotBridgeStpPortTable OBJECT-TYPE
@@ -824,7 +824,7 @@ begemotBridgeStpPortAdminPathCost OBJECT-TYPE
     ::= { begemotBridgeStpExtPortEntry 6 }
 
 -- ---------------------------------------------------------- --
--- the Bridge interface Transparent bridging table 
+-- the Bridge interface Transparent bridging table
 -- ---------------------------------------------------------- --
 
 begemotBridgeTpTable OBJECT-TYPE
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index 0daceec..33de19f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -330,7 +330,7 @@ bridge_addrs_dump(struct bridge_if *bif)
  */
 
 /*
- * Construct the SNMP index from the address DST Mac. 
+ * Construct the SNMP index from the address DST Mac.
  */
 static void
 bridge_addrs_index_append(struct asn_oid *oid, uint sub,
@@ -449,7 +449,7 @@ get:
 
 /*
  * Construct the SNMP index from the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static int
 bridge_addrs_begemot_index_append(struct asn_oid *oid, uint sub,
@@ -477,7 +477,7 @@ bridge_addrs_begemot_index_append(struct asn_oid *oid, uint sub,
 
 /*
  * Find a bridge address entry by the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static struct tp_entry *
 bridge_addrs_begemot_get(const struct asn_oid *oid, uint sub)
@@ -507,7 +507,7 @@ bridge_addrs_begemot_get(const struct asn_oid *oid, uint sub)
 
 /*
  * Find the next bridge address entry by the bridge interface name
- * and the address DST Mac. 
+ * and the address DST Mac.
  */
 static struct tp_entry *
 bridge_addrs_begemot_getnext(const struct asn_oid *oid, uint sub)
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index e5f5c50..fd7fba0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -433,7 +433,7 @@ bridge_update_bif(struct bridge_if *bif)
 }
 
 /*
- * Update all bridge interfaces' ports only - 
+ * Update all bridge interfaces' ports only -
  * make sure each bridge interface exists first.
  */
 void
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index 0127cea..cbb8dc8 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -626,7 +626,7 @@ op_dot1d_stp_ext_port(struct snmp_context *ctx, struct snmp_value *val,
 			    return (SNMP_ERR_NOERROR);
 
 			case LEAF_dot1dStpPortAdminPointToPoint:
-			    if (val->v.integer < 0 || val->v.integer > 
+			    if (val->v.integer < 0 || val->v.integer >
 				StpPortAdminPointToPointType_auto)
 				return (SNMP_ERR_WRONG_VALUE);
 
@@ -864,7 +864,7 @@ bridge_port_index_getnext(const struct asn_oid *oid, uint sub, int8_t status)
 		for (i = 0; i < oid->subs[sub]; i++)
 			bif_name[i] = oid->subs[sub + i + 1];
 		bif_name[i] = '\0';
-	
+
 		port_no = oid->subs[sub + i + 1];
 
 		if ((bif = bridge_if_find_ifname(bif_name)) == NULL ||
@@ -937,7 +937,7 @@ bridge_port_set_status(struct snmp_context *ctx,
 		ctx->scratch->int1 = bp->status;
 		bp->status = RowStatus_active;
 		break;
-		
+
 	    case RowStatus_notInService:
 		if (bp == NULL || bp->span_enable == 0 ||
 		    bp->status == RowStatus_active)
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index f8644f4..b0efd13 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -295,7 +295,7 @@ bridge_set_priority(struct bridge_if *bif, int32_t priority)
 
 	/*
 	 * Re-fetching the data from the driver after that might be a good
-	 * idea, since changing our bridge's priority should invoke 
+	 * idea, since changing our bridge's priority should invoke
 	 * recalculation of the active spanning tree topology in the network.
 	 */
 	bif->priority = priority;
@@ -1319,7 +1319,7 @@ bridge_addrs_getinfo_ifalist(struct bridge_if *bif, struct ifbareq **buf)
 	struct ifbaconf bac;
 	struct ifdrv ifd;
 
-	*buf = NULL; 
+	*buf = NULL;
 	strlcpy(ifd.ifd_name, bif->bif_name, IFNAMSIZ);
 	ifd.ifd_cmd = BRDGRTS;
 	ifd.ifd_len = sizeof(bac);
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index b77b5f7..39cb059 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
@@ -1,7 +1,7 @@
 .\"-
 .\" Copyright (C) 2006 Shteryana Shopova <syrinx@FreeBSD.org>
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -10,7 +10,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 774c027..1c7e295 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
@@ -2,7 +2,7 @@
 .\" Copyright (C) 2005-2006
 .\" 	The FreeBSD Project.
 .\" 	All rights reserved.
-.\" 
+.\"
 .\" Author: Harti Brandt <harti@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
index d9d136a..4b1da05 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
@@ -173,7 +173,7 @@ ng_unregister_cookie(void *dd)
  * Register a function for hook data.
  */
 void *
-ng_register_hook(const struct lmodule *mod, const char *hook, 
+ng_register_hook(const struct lmodule *mod, const char *hook,
     ng_hook_f *func, void *arg)
 {
 	struct datareg *d;
@@ -893,7 +893,7 @@ ng_peer_hook_id(ng_ID_t node, const char *hook, char *peerhook)
 		else
 			strcpy(peerhook, hooklist->link[i].peerhook);
 
-	} else 
+	} else
 		strcpy(peerhook, hooklist->link[i].peerhook);
 
 	free(resp);
@@ -903,7 +903,7 @@ ng_peer_hook_id(ng_ID_t node, const char *hook, char *peerhook)
 
 
 /*
- * Now the module is started. Select on the sockets, so that we can get 
+ * Now the module is started. Select on the sockets, so that we can get
  * unsolicited input.
  */
 static void
@@ -926,7 +926,7 @@ ng_start(void)
 		return;
 	}
 
-	reg_index = or_register(&oid_begemotNg, 
+	reg_index = or_register(&oid_begemotNg,
 	    "The MIB for the NetGraph access module for SNMP.", module);
 }
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
index d2b247f..d92b6ac 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
@@ -1,4 +1,4 @@
--- 
+--
 -- ----------------------------------------------------------------------------
 -- "THE BEER-WARE LICENSE" (Revision 42):
 -- <philip@FreeBSD.org> wrote this file.  As long as you retain this notice you
@@ -7,7 +7,7 @@
 -- ----------------------------------------------------------------------------
 --
 -- $FreeBSD$
--- 
+--
 
 BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN
 
@@ -612,7 +612,7 @@ pfInterfacesIfIndex OBJECT-TYPE
     DESCRIPTION
 	"A unique value, greater than zero, for each interface."
     ::= { pfInterfacesIfEntry 1 }
-    
+
 pfInterfacesIfDescr OBJECT-TYPE
     SYNTAX	OCTET STRING
     MAX-ACCESS	read-only
@@ -876,7 +876,7 @@ pfTablesTblTZero OBJECT-TYPE
         cleared or the time since this table was loaded, whichever is
         sooner."
     ::= { pfTablesTblEntry 4 }
-	
+
 pfTablesTblRefsAnchor OBJECT-TYPE
     SYNTAX	Integer32
     MAX-ACCESS  read-only
@@ -1294,7 +1294,7 @@ pfLabelsLblIndex OBJECT-TYPE
     STATUS	current
     DESCRIPTION
 	"A unique value, greater than zero, for each label."
-    ::= { pfLabelsLblEntry 1 } 
+    ::= { pfLabelsLblEntry 1 }
 
 pfLabelsLblName OBJECT-TYPE
     SYNTAX	OCTET STRING
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index 6218932..efe2e95 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-# 
+#
 # Author: Philip Paeps <philip@freebsd.org>
 
 MOD=	pf
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index 1048ffe..c35f0db 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -650,7 +650,7 @@ pf_iftable(struct snmp_context __unused *ctx, struct snmp_value *val,
 			    e->pfi.pfik_packets[IPV6][OUT][PASS];
 			break;
 		case LEAF_pfInterfacesIf6PktsOutBlock:
-			val->v.counter64 = 
+			val->v.counter64 =
 			    e->pfi.pfik_packets[IPV6][OUT][BLOCK];
 			break;
 
@@ -932,7 +932,7 @@ pf_altq(struct snmp_context __unused *ctx, struct snmp_value *val,
 
 	abort();
 	return (SNMP_ERR_GENERR);
-}	
+}
 
 int
 pf_altqq(struct snmp_context __unused *ctx, struct snmp_value *val,
@@ -987,7 +987,7 @@ pf_altqq(struct snmp_context __unused *ctx, struct snmp_value *val,
 		case LEAF_pfAltqQueueLimit:
 			val->v.integer = e->altq.qlimit;
 			break;
-		
+
 		default:
 			return (SNMP_ERR_NOSUCHNAME);
 	}
@@ -1225,7 +1225,7 @@ pfq_refresh(void)
 	}
 
 	bzero(&pa, sizeof(pa));
-	
+
 	if (ioctl(dev, DIOCGETALTQS, &pa)) {
 		syslog(LOG_ERR, "pfq_refresh: ioctl(DIOCGETALTQS): %s",
 		    strerror(errno));
@@ -1260,7 +1260,7 @@ pfq_refresh(void)
 			INSERT_OBJECT_INT_LINK_INDEX(e, &pfq_table, link, index);
 		}
 	}
-	
+
 	pfq_table_age = time(NULL);
 	pf_tick = this_tick;
 
@@ -1648,7 +1648,7 @@ altq_is_enabled(int pfdev)
 			syslog(LOG_INFO, "No ALTQ support in kernel\n"
 			    "ALTQ related functions disabled\n");
                         return (0);
-                } else  
+                } else
                         syslog(LOG_ERR, "DIOCGETALTQS returned an error: %s",
 			    strerror(errno));
 			return (-1);
@@ -1674,7 +1674,7 @@ pf_init(struct lmodule *mod, int __unused argc, char __unused *argv[])
 		syslog(LOG_ERR, "pf_init(): altq test failed");
 		return (-1);
 	}
-	
+
 	/* Prepare internal state */
 	TAILQ_INIT(&pfi_table);
 	TAILQ_INIT(&pfq_table);
@@ -1765,7 +1765,7 @@ pf_dump(void)
 	    (intmax_t)pfi_table_age);
 	syslog(LOG_ERR, "Dump: pfi_table_count = %d",
 	    pfi_table_count);
-	
+
 	syslog(LOG_ERR, "Dump: pfq_table_age = %jd",
 	    (intmax_t)pfq_table_age);
 	syslog(LOG_ERR, "Dump: pfq_table_count = %d",
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
index 10141e5..e6216ea 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
@@ -15,6 +15,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
index 4ae818a..1c42245 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
@@ -17,6 +17,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
index 1be8d62..4a09cde 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
@@ -15,6 +15,6 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
 CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
 
 DEFS=	${MOD}_tree.def
-BMIBS=	
+BMIBS=
 
 .include <bsd.snmpmod.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
index ec94ac6..92091f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
@@ -1841,7 +1841,7 @@ op_wlan_wep_iface(struct snmp_context *ctx, struct snmp_value *val,
 	default:
 		abort();
 	}
-	
+
 	return (SNMP_ERR_NOERROR);
 }
 
@@ -3435,7 +3435,7 @@ wlan_get_channel_type(struct ieee80211_channel *c)
 		return (WlanChannelType_turbo);
 	if (IEEE80211_IS_CHAN_HT(c))
 		return (WlanChannelType_ht);
-		
+
 	return (-1);
 }
 
@@ -3740,7 +3740,7 @@ wlan_scan_add_result(struct wlan_iface *wif, struct wlan_scan_result *sr)
 	    	SLIST_INSERT_HEAD(&wif->scanlist, sr, wsr);
 	    	return (0);
 	}
-	
+
 	SLIST_FOREACH(temp, &wif->scanlist, wsr) {
 		if (wlan_scan_compare_result(sr, temp) < 0)
 			break;
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
index 9e184f5..de6587f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
@@ -182,7 +182,7 @@ struct wlan_iface {
 	enum wlanHWMPRootMode		hwmp_root_mode;
 	uint32_t			hwmp_max_hops;
 	struct wlan_mesh_routes		mesh_routelist;
-		
+
 	SLIST_ENTRY(wlan_iface)		w_if;
 };
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
index 739f11f..9db30ae 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2010 The FreeBSD Foundation
  * All rights reserved.
- 
+
  * This software was developed by Shteryana Sotirova Shopova under
  * sponsorship from the FreeBSD Foundation.
  *
@@ -158,7 +158,7 @@ wlan_kmodules_load(void)
 		syslog(LOG_NOTICE, "SNMP wlan loaded %s module",
 		    wmod_names[WLAN_KMOD_WEP]);
 
-	return (0);	
+	return (0);
 }
 
 /* XXX: FIXME */
@@ -2387,7 +2387,7 @@ wlan_get_mac_policy(struct wlan_iface *wif)
 			wif->mac_policy = wlanMACAccessControlPolicy_open;
 			return (0);
 		}
-		
+
 	}
 
 	wif->macsupported = 1;
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
index 5f79840..1aeafd3 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
@@ -777,7 +777,7 @@ parse_syntax_val(struct snmp_value *value, enum snmp_syntax syntax, char *val)
 }
 
 /*
- * Parse a command line argument of type OID=syntax:value and fill in whatever 
+ * Parse a command line argument of type OID=syntax:value and fill in whatever
  * fields can be derived from the input into snmp_value structure. Reads numeric
  * OIDs.
  */
@@ -909,7 +909,7 @@ parse_pair_stroid_val(struct snmp_toolinfo *snmptoolctx,
 
 	if ((ptr = snmptools_parse_stroid(snmptoolctx, obj, argv)) == NULL)
 		return (-1);
- 
+
 	if (*ptr != '=') {
 		warnx("Value to set expected after OID");
 		return (-1);
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
index 09684ac..d4f305f 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
@@ -53,7 +53,7 @@
  * subtype := STRING
  *
  * enum := ENUM '(' value ')'
- * 
+ *
  * bits := BITS '(' value ')'
  *
  * value := INT STRING | INT STRING value
@@ -483,7 +483,7 @@ snmp_import_update_table(enum snmp_tbl_entry te, struct snmp_index_entry *tbl)
 	switch (te) {
 		case ENTRY_NONE:
 			if (table_data.tbl_type == ENTRY_NONE)
-				return (NULL);	
+				return (NULL);
 			if (table_data.tbl_type == ENTRY_INDEX)
 				table_data.table_idx = NULL;
 			table_data.tbl_type--;
@@ -539,7 +539,7 @@ parse_subtype(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
 		warnx("subtype expected after '|'");
 		return (-1);
 	}
-	
+
 	*tc = snmp_get_tc(nexttok);
 	*tok = gettoken(snmptoolctx);
 
@@ -806,7 +806,7 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
 		if (snmp_suboid_append(&current_oid, (asn_subid_t) val) < 0)
 			goto error;
 
-		/* 
+		/*
 		 * Ignore the error for nodes since the .def files currently
 		 * contain different strings for 1.3.6.1.2.1 - mibII. Only make
 		 * sure the memory is freed and don't complain.
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
index 7e2b721..abee9c2 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
@@ -29,7 +29,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 
@@ -636,7 +636,7 @@ snmp_mapping_dumptable(struct snmp_table_index *headp)
 	}
 }
 
-void 
+void
 snmp_mapping_dump(struct snmp_toolinfo *snmptoolctx /* int bits */)
 {
 	if (!_bsnmptools_debug)
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
index d945b89..cd7316f 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptc.c
@@ -31,7 +31,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -1143,7 +1143,7 @@ parse_bport_id(struct snmp_value *value, char *string)
  **************************************************************
  * TODO: FIXME!!! syrinx: Since we do not support checking the
  * consistency of a varbinding based on the value of a previous
- * one, try to guess the type of address based on the 
+ * one, try to guess the type of address based on the
  * OctetString SIZE - 4 for IPv4, 16 for IPv6, others currently
  * not supported.
  */
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
index 3e11bbc..87829d6 100644
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
@@ -31,7 +31,7 @@
  * $FreeBSD$
  */
 
-#include <sys/param.h> 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 
@@ -117,7 +117,7 @@ static const struct {
 	{ "Gauge", SNMP_SYNTAX_GAUGE },
 	{ "TimeTicks", SNMP_SYNTAX_TIMETICKS },
 	{ "Counter64", SNMP_SYNTAX_COUNTER64 },
-	{ "Unknown", SNMP_SYNTAX_UNKNOWN }, 
+	{ "Unknown", SNMP_SYNTAX_UNKNOWN },
 };
 
 int
@@ -189,7 +189,7 @@ snmptool_init(struct snmp_toolinfo *snmptoolctx)
 
 #define	OBJECT_IDX_LIST(o)	o->info->table_idx->index_list
 
-/* 
+/*
  * Walk through the file list and import string<->oid mappings from each file.
  */
 int32_t
@@ -287,7 +287,7 @@ free_filelist(struct snmp_toolinfo *snmptoolctx)
 	}
 }
 
-static char 
+static char
 isvalid_fchar(char c, int pos)
 {
 	if (isalpha(c)|| c == '/'|| c == '_' || c == '.' || c == '~' ||
@@ -652,7 +652,7 @@ parse_user_security(struct snmp_toolinfo *snmptoolctx __unused, char *opt_arg)
 				warnx("Suboption 'engine' - no argument");
 				return (-1);
 			}
-			snmp_client.engine.engine_len = parse_ascii(val, 
+			snmp_client.engine.engine_len = parse_ascii(val,
 			    snmp_client.engine.engine_id, SNMP_ENGINE_ID_SIZ);
 			if ((int32_t)snmp_client.engine.engine_len == -1) {
 				warnx("Bad EngineID - %s", val);
@@ -1470,7 +1470,7 @@ snmp_pdu_add_bindings(struct snmp_toolinfo *snmptoolctx,
 	/* Return 0 in case of no more work todo. */
 	if (SLIST_EMPTY(&snmptoolctx->snmp_objectlist))
 		return (0);
-	
+
 	if (maxcount < 0 || maxcount > SNMP_MAX_BINDINGS) {
 		warnx("maxcount out of range: <0 || >SNMP_MAX_BINDINGS");
 		return (-1);