components/net-snmp/patches/041.17962944.mteTrigger.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Fri, 02 May 2014 12:23:29 +0200
branchs11u1-sru
changeset 3109 1940d0927363
parent 3030 d77bcfbaa552
permissions -rw-r--r--
17758422 50 or more exec options in snmpd.conf results in errors
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3030
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     1
# This comes from upstream:
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     2
# http://sourceforge.net/p/net-snmp/code/ci/22bfcd5e555097796e08b2a453ecaa3fafc31266/
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     3
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     4
--- a/agent/mibgroup/disman/event/mteTrigger.c
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     5
+++ b/agent/mibgroup/disman/event/mteTrigger.c
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     6
@@ -336,7 +336,7 @@
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     7
                     if (vp1_prev) {
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     8
                         vp1_prev->next_variable = vtmp;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
     9
                     } else {
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    10
-                        entry->old_results      = vtmp;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    11
+                        var                     = vtmp;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    12
                     }
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    13
                     vp1_prev = vtmp;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    14
                     vp2_prev = vp2;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    15
@@ -433,7 +433,7 @@
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    16
              */
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    17
             if (entry->mteTExTest & entry->mteTExStartup & MTE_EXIST_ABSENT) {
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    18
                 if (!(entry->flags & MTE_TRIGGER_FLAG_VWILD) &&
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    19
-                    vp1->type == ASN_NULL ) {
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    20
+                    var->type == ASN_NULL ) {
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    21
                     DEBUGMSGTL(( "disman:event:trigger:fire",
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    22
                                  "Firing initial existence test: "));
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    23
                     DEBUGMSGOID(("disman:event:trigger:fire",
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    24
@@ -449,10 +449,10 @@
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    25
                      *  to report a NULL value, but this clashes with
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    26
                      * the syntax of the mteHotValue MIB object.
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    27
                      */
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    28
-                    entry->mteTriggerFired    = vp1;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    29
+                    entry->mteTriggerFired    = var;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    30
                     n = entry->mteTriggerValueID_len;
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    31
                     mteEvent_fire(entry->mteTExEvOwner, entry->mteTExEvent, 
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    32
-                                  entry, vp1->name+n, vp1->name_length-n);
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    33
+                                  entry, var->name+n, var->name_length-n);
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    34
                 }
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    35
             }
d77bcfbaa552 17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff changeset
    36
         } /* !old_results */