components/net-snmp/patches/041.17962944.mteTrigger.patch
changeset 1779 7138a765423b
equal deleted inserted replaced
1778:e33339fcff14 1779:7138a765423b
       
     1 # This comes from upstream:
       
     2 # http://sourceforge.net/p/net-snmp/code/ci/22bfcd5e555097796e08b2a453ecaa3fafc31266/
       
     3 
       
     4 --- a/agent/mibgroup/disman/event/mteTrigger.c
       
     5 +++ b/agent/mibgroup/disman/event/mteTrigger.c
       
     6 @@ -336,7 +336,7 @@
       
     7                      if (vp1_prev) {
       
     8                          vp1_prev->next_variable = vtmp;
       
     9                      } else {
       
    10 -                        entry->old_results      = vtmp;
       
    11 +                        var                     = vtmp;
       
    12                      }
       
    13                      vp1_prev = vtmp;
       
    14                      vp2_prev = vp2;
       
    15 @@ -433,7 +433,7 @@
       
    16               */
       
    17              if (entry->mteTExTest & entry->mteTExStartup & MTE_EXIST_ABSENT) {
       
    18                  if (!(entry->flags & MTE_TRIGGER_FLAG_VWILD) &&
       
    19 -                    vp1->type == ASN_NULL ) {
       
    20 +                    var->type == ASN_NULL ) {
       
    21                      DEBUGMSGTL(( "disman:event:trigger:fire",
       
    22                                   "Firing initial existence test: "));
       
    23                      DEBUGMSGOID(("disman:event:trigger:fire",
       
    24 @@ -449,10 +449,10 @@
       
    25                       *  to report a NULL value, but this clashes with
       
    26                       * the syntax of the mteHotValue MIB object.
       
    27                       */
       
    28 -                    entry->mteTriggerFired    = vp1;
       
    29 +                    entry->mteTriggerFired    = var;
       
    30                      n = entry->mteTriggerValueID_len;
       
    31                      mteEvent_fire(entry->mteTExEvOwner, entry->mteTExEvent, 
       
    32 -                                  entry, vp1->name+n, vp1->name_length-n);
       
    33 +                                  entry, var->name+n, var->name_length-n);
       
    34                  }
       
    35              }
       
    36          } /* !old_results */