Apply patch from bug report 581618 (also applicable to dynix)
Provided by Nicholas L. Nigay
git-svn-id: file:///home/hardaker/lib/sf-bkups/net-snmp-convert-svnrepo/trunk@7276 06827809-a52a-0410-b366-d66718629ded
diff --git a/agent/mibgroup/ucd-snmp/memory_dynix.c b/agent/mibgroup/ucd-snmp/memory_dynix.c
index b28e11e..03ed5fc 100644
--- a/agent/mibgroup/ucd-snmp/memory_dynix.c
+++ b/agent/mibgroup/ucd-snmp/memory_dynix.c
@@ -1,4 +1,4 @@
-#include <config.h> /* local SNMP configuration details */
+#include <net-snmp/net-snmp-config.h>
#ifdef dynix
# ifdef HAVE_SYS_SWAP_H
@@ -72,7 +72,7 @@
* Define the OID pointer to the top of the mib tree that we're
* registering underneath
*/
- oid mem_variables_oid[] = { EXTENSIBLEMIB, MEMMIBNUM };
+ oid mem_variables_oid[] = { UCDAVIS_MIB, MEMMIBNUM };
/*
* register ourselves with the agent to handle our mib tree
diff --git a/agent/mibgroup/ucd-snmp/memory_hpux.c b/agent/mibgroup/ucd-snmp/memory_hpux.c
index 3cf863c..fc1f7d9 100644
--- a/agent/mibgroup/ucd-snmp/memory_hpux.c
+++ b/agent/mibgroup/ucd-snmp/memory_hpux.c
@@ -1,4 +1,4 @@
-#include <config.h> /* local SNMP configuration details */
+#include <net-snmp/net-snmp-config.h>
#if HAVE_STRING_H
#include <string.h>
#endif
@@ -12,16 +12,9 @@
#include <dmalloc.h>
#endif
-#include "mibincl.h" /* Standard set of SNMP includes */
-#include "util_funcs.h" /* utility function declarations */
-#include "read_config.h" /* if the module uses run-time */
- /*
- * configuration controls
- */
-#include "auto_nlist.h" /* if the module needs to read */
- /*
- * kernel data structures
- */
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include <net-snmp/agent/auto_nlist.h>
#include "memory.h" /* the module-specific header */
#include "memory_hpux.h" /* the module-specific header */
@@ -98,7 +91,7 @@
* Define the OID pointer to the top of the mib tree that we're
* registering underneath
*/
- oid mem_variables_oid[] = { EXTENSIBLEMIB, MEMMIBNUM };
+ oid mem_variables_oid[] = { UCDAVIS_MIB, MEMMIBNUM };
/*
* register ourselves with the agent to handle our mib tree
diff --git a/agent/mibgroup/ucd-snmp/vmstat_dynix.c b/agent/mibgroup/ucd-snmp/vmstat_dynix.c
index 3a36944..2dcaddd 100644
--- a/agent/mibgroup/ucd-snmp/vmstat_dynix.c
+++ b/agent/mibgroup/ucd-snmp/vmstat_dynix.c
@@ -19,6 +19,7 @@
/*
* Includes start here
*/
+#include <net-snmp/net-snmp-config.h>
/*
* Standard includes
@@ -210,7 +211,7 @@
/*
* registering underneath
*/
- oid vmstat_variables_oid[] = { EXTENSIBLEMIB, 11 };
+ oid vmstat_variables_oid[] = { UCDAVIS_MIB, 11 };
/*
* register ourselves with the agent to handle our mib tree
diff --git a/agent/mibgroup/ucd-snmp/vmstat_hpux.c b/agent/mibgroup/ucd-snmp/vmstat_hpux.c
index 67faf73..78d73bf 100644
--- a/agent/mibgroup/ucd-snmp/vmstat_hpux.c
+++ b/agent/mibgroup/ucd-snmp/vmstat_hpux.c
@@ -15,6 +15,11 @@
*/
/*
+ * UCD-SNMP config details
+ */
+#include <net-snmp/net-snmp-config.h>
+
+/*
* Standard includes
*/
#include <stdlib.h>
@@ -29,22 +34,18 @@
#include <sys/pstat.h>
#include <sys/dk.h>
-/*
- * UCD-SNMP config details
- */
-#include <config.h>
/*
* Includes needed for all modules
*/
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/agent/net-snmp-agent-includes.h>
#include "mibdefs.h"
-#include "mibincl.h"
/*
* Utility functions for UCD-SNMP
*/
#include "util_funcs.h"
-#include <snmp_alarm.h>
/*
* Header file for this module
@@ -230,7 +231,7 @@
/*
* registering underneath
*/
- oid vmstat_variables_oid[] = { EXTENSIBLEMIB, 11 };
+ oid vmstat_variables_oid[] = { UCDAVIS_MIB, 11 };
/*
* register ourselves with the agent to handle our mib tree
