As known the notification log MIB was disabled recently on the V5.4 branch
because it triggered a build failure (
http://net-snmp.svn.sourceforge.net/viewvc/net-snmp?view=rev&revision=18496).
The patch below reenables the notification log MIB, but only when building
with the Windows Platform SDK enabled.
Just as for the Win32 IPv6 build fix, I´ll wait with committing this patch
until Dave has had a chance to comment and/or vote on this patch, so the
vote window will be longer than the usual 24 hours.
As usual, any feedback is welcome.
Index: win32/snmpdsdk/Makefile.in
===================================================================
--- win32/snmpdsdk/Makefile.in (revision 18545)
+++ win32/snmpdsdk/Makefile.in (working copy)
@@ -28,6 +28,7 @@
CLEAN :
-...@erase "$(INTDIR)\auto_nlist.obj"
-...@erase "$(INTDIR)\kernel.obj"
+ -...@erase "$(INTDIR)\notification_log.obj"
-...@erase "$(INTDIR)\snmpd.obj"
-...@erase "$(INTDIR)\vc??.idb"
-...@erase "$(INTDIR)\winservice.obj"
@@ -89,6 +90,7 @@
LINK32_OBJS= \
"$(INTDIR)\auto_nlist.obj" \
"$(INTDIR)\kernel.obj" \
+ "$(INTDIR)\notification_log.obj" \
"$(INTDIR)\snmpd.obj" \
"$(INTDIR)\winservice.obj" \
"$(INTDIR)\winservice.res"
@@ -114,6 +116,8 @@
-...@erase "$(INTDIR)\auto_nlist.sbr"
-...@erase "$(INTDIR)\kernel.obj"
-...@erase "$(INTDIR)\kernel.sbr"
+ -...@erase "$(INTDIR)\notification_log.obj"
+ -...@erase "$(INTDIR)\notification_log.sbr"
-...@erase "$(INTDIR)\snmpd.obj"
-...@erase "$(INTDIR)\snmpd.sbr"
-...@erase "$(INTDIR)\vc??.idb"
@@ -176,6 +180,7 @@
BSC32_SBRS= \
"$(INTDIR)\auto_nlist.sbr" \
"$(INTDIR)\kernel.sbr" \
+ "$(INTDIR)\notification_log.sbr" \
"$(INTDIR)\snmpd.sbr" \
"$(INTDIR)\winservice.sbr"
@@ -189,6 +194,7 @@
LINK32_OBJS= \
"$(INTDIR)\auto_nlist.obj" \
"$(INTDIR)\kernel.obj" \
+ "$(INTDIR)\notification_log.obj" \
"$(INTDIR)\snmpd.obj" \
"$(INTDIR)\winservice.obj" \
"$(INTDIR)\winservice.res"
@@ -253,6 +259,24 @@
!ENDIF
+SOURCE=..\..\agent\mibgroup\notification-log-mib\notification_log.c
+
+!IF "$(CFG)" == "release"
+
+
+"$(INTDIR)\notification_log.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "debug"
+
+
+"$(INTDIR)\notification_log.obj" "$(INTDIR)\notification_log.sbr" :
$(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=..\..\agent\snmpd.c
!IF "$(CFG)" == "release"
Index: win32/net-snmp/agent/mib_module_config.h
===================================================================
--- win32/net-snmp/agent/mib_module_config.h (revision 18545)
+++ win32/net-snmp/agent/mib_module_config.h (working copy)
@@ -16,7 +16,11 @@
#define USING_NOTIFICATION_MODULE 1
/* Define if compiling with the notification-log-mib module files. */
+#ifdef HAVE_PLATFORM_SDK
+#define USING_NOTIFICATION_LOG_MIB_NOTIFICATION_LOG_MODULE 1
+#else
/* #undef USING_NOTIFICATION_LOG_MIB_NOTIFICATION_LOG_MODULE */
+#endif
/* Define if compiling with the target module files. */
#define USING_TARGET_MODULE 1
Index: win32/snmpdsdk/Makefile.in
===================================================================
--- win32/snmpdsdk/Makefile.in (revision 18545)
+++ win32/snmpdsdk/Makefile.in (working copy)
@@ -28,6 +28,7 @@
CLEAN :
-...@erase "$(INTDIR)\auto_nlist.obj"
-...@erase "$(INTDIR)\kernel.obj"
+ -...@erase "$(INTDIR)\notification_log.obj"
-...@erase "$(INTDIR)\snmpd.obj"
-...@erase "$(INTDIR)\vc??.idb"
-...@erase "$(INTDIR)\winservice.obj"
@@ -89,6 +90,7 @@
LINK32_OBJS= \
"$(INTDIR)\auto_nlist.obj" \
"$(INTDIR)\kernel.obj" \
+ "$(INTDIR)\notification_log.obj" \
"$(INTDIR)\snmpd.obj" \
"$(INTDIR)\winservice.obj" \
"$(INTDIR)\winservice.res"
@@ -114,6 +116,8 @@
-...@erase "$(INTDIR)\auto_nlist.sbr"
-...@erase "$(INTDIR)\kernel.obj"
-...@erase "$(INTDIR)\kernel.sbr"
+ -...@erase "$(INTDIR)\notification_log.obj"
+ -...@erase "$(INTDIR)\notification_log.sbr"
-...@erase "$(INTDIR)\snmpd.obj"
-...@erase "$(INTDIR)\snmpd.sbr"
-...@erase "$(INTDIR)\vc??.idb"
@@ -176,6 +180,7 @@
BSC32_SBRS= \
"$(INTDIR)\auto_nlist.sbr" \
"$(INTDIR)\kernel.sbr" \
+ "$(INTDIR)\notification_log.sbr" \
"$(INTDIR)\snmpd.sbr" \
"$(INTDIR)\winservice.sbr"
@@ -189,6 +194,7 @@
LINK32_OBJS= \
"$(INTDIR)\auto_nlist.obj" \
"$(INTDIR)\kernel.obj" \
+ "$(INTDIR)\notification_log.obj" \
"$(INTDIR)\snmpd.obj" \
"$(INTDIR)\winservice.obj" \
"$(INTDIR)\winservice.res"
@@ -253,6 +259,24 @@
!ENDIF
+SOURCE=..\..\agent\mibgroup\notification-log-mib\notification_log.c
+
+!IF "$(CFG)" == "release"
+
+
+"$(INTDIR)\notification_log.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "debug"
+
+
+"$(INTDIR)\notification_log.obj" "$(INTDIR)\notification_log.sbr" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=..\..\agent\snmpd.c
!IF "$(CFG)" == "release"
Index: win32/net-snmp/agent/mib_module_config.h
===================================================================
--- win32/net-snmp/agent/mib_module_config.h (revision 18545)
+++ win32/net-snmp/agent/mib_module_config.h (working copy)
@@ -16,7 +16,11 @@
#define USING_NOTIFICATION_MODULE 1
/* Define if compiling with the notification-log-mib module files. */
+#ifdef HAVE_PLATFORM_SDK
+#define USING_NOTIFICATION_LOG_MIB_NOTIFICATION_LOG_MODULE 1
+#else
/* #undef USING_NOTIFICATION_LOG_MIB_NOTIFICATION_LOG_MODULE */
+#endif
/* Define if compiling with the target module files. */
#define USING_TARGET_MODULE 1
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Net-snmp-coders mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
