Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > c0394d3068b44395994f031447c8052d > files > 65

net-snmp-5.3.2.2-7.el5_4.2.src.rpm

468147: [5.3] When SNMP notifies trap, the error message is output.

Source: upstream, SVN rev. 15255

Do not initialize traps and other object more than once when reading the config
file.

Index: net-snmp/agent/mibgroup/disman/event/mteObjects.c
===================================================================
--- net-snmp/agent/mibgroup/disman/event/mteObjects.c	(revision 15254)
+++ net-snmp/agent/mibgroup/disman/event/mteObjects.c	(revision 15255)
@@ -61,6 +61,10 @@
 _init_default_mteObject_lists( int majorID, int minorID,
                                void *serverargs, void *clientarg)
 {
+    static int _defaults_init = 0;
+
+    if (_defaults_init)
+        return 0;
                                                    /* mteHotTrigger     */
     _init_default_mteObject( "_triggerFire", ".1.3.6.1.2.1.88.2.1.1", 1, 0);
                                                    /* mteHotTargetName  */
@@ -91,6 +95,7 @@
                                                    /* ifOperStatus  */
     _init_default_mteObject( "_linkUpDown", ".1.3.6.1.2.1.2.2.1.8", 3, 1);
 
+    _defaults_init = 1;
     return 0;
 }
 
Index: net-snmp/agent/mibgroup/disman/event/mteEvent.c
===================================================================
--- net-snmp/agent/mibgroup/disman/event/mteEvent.c	(revision 15254)
+++ net-snmp/agent/mibgroup/disman/event/mteEvent.c	(revision 15255)
@@ -38,11 +38,15 @@
 void
 init_mteEvent(void)
 {
+    static int _defaults_init = 0;
     init_event_table_data();
 
     /*
      * Insert fixed events for the default trigger notifications
      */
+    if ( _defaults_init)
+        return;
+
     _init_default_mteEvent( "mteTriggerFired",    "_triggerFire", 1 );
     _init_default_mteEvent( "mteTriggerRising",   "_triggerFire", 2 );
     _init_default_mteEvent( "mteTriggerFalling",  "_triggerFire", 3 );
@@ -50,6 +54,7 @@
 
     _init_link_mteEvent( "linkDown", "_linkUpDown", 3 );
     _init_link_mteEvent( "linkUp",   "_linkUpDown", 4 );
+    _defaults_init = 1;
 }
 
 void