7 files changed, 26 insertions, 17 deletions
diff --git a/contrib/bsnmp/snmpd/bsnmpd.1 b/contrib/bsnmp/snmpd/bsnmpd.1
index 9da7456..18c46d2 100644
--- a/contrib/bsnmp/snmpd/bsnmpd.1
+++ b/contrib/bsnmp/snmpd/bsnmpd.1
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/snmpd/bsnmpd.1,v 1.9 2005/10/04 08:46:54 brandt_h Exp $
+.\" $Begemot: bsnmp/snmpd/bsnmpd.1,v 1.12 2006/02/27 09:50:03 brandt_h Exp $
 .\"
-.Dd October 4, 2005
-.Dt SNMPD 1
+.Dd February 27, 2006
+.Dt BSNMPD 1
 .Os
 .Sh NAME
 .Nm bsnmpd
@@ -49,7 +49,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-daemon servers the internet SNMP (Simple Network Management Protocol).
+daemon server the internet SNMP (Simple Network Management Protocol).
 It is intended to serve only the absolute basic MIBs and implement all other
 MIBs through loadable modules.
 In this way the
@@ -258,9 +258,14 @@ This is the default search path for system include files.
 .It Pa @MIBSPATH@BEGEMOT-MIB.txt
 .It Pa @MIBSPATH@BEGEMOT-SNMPD.txt
 The definitions for the MIBs implemented in the daemon.
+.It Pa /etc/hosts.allow, /etc/hosts.deny
+Access controls that should be enforced by TCP wrappers should be defined here.
+Further details are described in
+.Xr hosts_access 5 .
 .El
 .Sh SEE ALSO
-.Xr gensnmptree 1
+.Xr gensnmptree 1 ,
+.Xr hosts_access 5
 .Sh STANDARDS
 The
 .Nm
diff --git a/contrib/bsnmp/snmpd/config.c b/contrib/bsnmp/snmpd/config.c
index 0701c41..6480d20 100644
--- a/contrib/bsnmp/snmpd/config.c
+++ b/contrib/bsnmp/snmpd/config.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmpd/config.c,v 1.24 2005/10/04 11:21:37 brandt_h Exp $
+ * $Begemot: bsnmp/snmpd/config.c,v 1.25 2006/02/14 09:04:20 brandt_h Exp $
  *
  * Parse configuration file.
  */
diff --git a/contrib/bsnmp/snmpd/export.c b/contrib/bsnmp/snmpd/export.c
index 52205e7..9498361 100644
--- a/contrib/bsnmp/snmpd/export.c
+++ b/contrib/bsnmp/snmpd/export.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmpd/export.c,v 1.7 2004/08/06 08:47:11 brandt Exp $
+ * $Begemot: bsnmp/snmpd/export.c,v 1.8 2006/02/14 09:04:20 brandt_h Exp $
  *
  * Support functions for modules.
  */
diff --git a/contrib/bsnmp/snmpd/main.c b/contrib/bsnmp/snmpd/main.c
index 32ccc45..b183d7f 100644
--- a/contrib/bsnmp/snmpd/main.c
+++ b/contrib/bsnmp/snmpd/main.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmpd/main.c,v 1.97 2005/10/04 14:32:45 brandt_h Exp $
+ * $Begemot: bsnmp/snmpd/main.c,v 1.100 2006/02/14 09:04:20 brandt_h Exp $
  *
  * SNMPd main stuff.
  */
@@ -52,15 +52,12 @@
 #include <tcpd.h>
 #endif
 
+#include "support.h"
 #include "snmpmod.h"
 #include "snmpd.h"
 #include "tree.h"
 #include "oid.h"
 
-#if !defined(INT32_MAX)
-#define	INT32_MAX	(0x7fffffff)
-#endif
-
 #define	PATH_PID	"/var/run/%s.pid"
 #define PATH_CONFIG	"/etc/%s.config"
 
@@ -1387,8 +1384,8 @@ main(int argc, char *argv[])
 						syslog(LOG_ERR,
 						    "no value for 'trace'");
 					else
-						snmp_trace =
-						    strtoul(value, NULL, 0);
+						snmp_trace = strtoul(value,
+						    NULL, 0);
 					break;
 
 				  case -1:
diff --git a/contrib/bsnmp/snmpd/snmpd.config b/contrib/bsnmp/snmpd/snmpd.config
index 4b018e8..23db74c 100644
--- a/contrib/bsnmp/snmpd/snmpd.config
+++ b/contrib/bsnmp/snmpd/snmpd.config
@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Begemot: bsnmp/snmpd/snmpd.config,v 1.15 2005/02/25 11:50:43 brandt_h Exp $
+# $Begemot: bsnmp/snmpd/snmpd.config,v 1.16 2006/02/14 09:04:20 brandt_h Exp $
 #
 # Example configuration file.
 #
diff --git a/contrib/bsnmp/snmpd/snmpmod.3 b/contrib/bsnmp/snmpd/snmpmod.3
index ed2717a..3ca067a 100644
--- a/contrib/bsnmp/snmpd/snmpmod.3
+++ b/contrib/bsnmp/snmpd/snmpmod.3
@@ -31,7 +31,7 @@
 .\"
 .\" $Begemot: bsnmp/snmpd/snmpmod.3,v 1.14 2005/10/04 13:30:35 brandt_h Exp $
 .\"
-.Dd October 4, 2005
+.Dd February 27, 2006
 .Dt SNMPMOD 3
 .Os
 .Sh NAME
@@ -85,6 +85,7 @@
 .Nm string_commit ,
 .Nm string_rollback ,
 .Nm string_get ,
+.Nm string_get_max ,
 .Nm string_free ,
 .Nm ip_save ,
 .Nm ip_rollback ,
@@ -197,6 +198,8 @@ Begemot SNMP library
 .Fn string_rollback "struct snmp_context *ctx" "u_char **strp"
 .Ft int
 .Fn string_get "struct snmp_value *val" "const u_char *str" "ssize_t len"
+.Ft int
+.Fn string_get_max "struct snmp_value *val" "const u_char *str" "ssize_t len" "size_t maxlen"
 .Ft void
 .Fn string_free "struct snmp_context *ctx"
 .Ft int
@@ -771,6 +774,10 @@ simply frees the saved old value in the scratch area.
 frees the new value, and puts back the old one.
 .It Fn string_get
 is used for GET or GETNEXT.
+The function
+.It Fn string_get_max
+can be used instead of
+.Nf stringto ensure that the returned string has a certain maximum length.
 If
 .Fa len
 is -1, the length is computed via
diff --git a/contrib/bsnmp/snmpd/snmpmod.h b/contrib/bsnmp/snmpd/snmpmod.h
index 18457bf..5eba370 100644
--- a/contrib/bsnmp/snmpd/snmpmod.h
+++ b/contrib/bsnmp/snmpd/snmpmod.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmpd/snmpmod.h,v 1.31 2005/10/04 13:30:36 brandt_h Exp $
+ * $Begemot: bsnmp/snmpd/snmpmod.h,v 1.32 2006/02/14 09:04:20 brandt_h Exp $
  *
  * SNMP daemon data and functions exported to modules.
  */