author | Huie-Ying Lee <huieying.lee@oracle.com> |
Wed, 20 May 2015 15:14:17 -0700 | |
branch | s11-update |
changeset 4329 | 771a6f41f496 |
parent 3024 | 17605ce48f74 |
permissions | -rw-r--r-- |
3024
17605ce48f74
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: |
17605ce48f74
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/ |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
3 |
|
17605ce48f74
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 |
17605ce48f74
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 |
17605ce48f74
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 @@ |
17605ce48f74
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) { |
17605ce48f74
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; |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
9 |
} else { |
17605ce48f74
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; |
17605ce48f74
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; |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
12 |
} |
17605ce48f74
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; |
17605ce48f74
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; |
17605ce48f74
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 @@ |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
16 |
*/ |
17605ce48f74
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) { |
17605ce48f74
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) && |
17605ce48f74
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 ) { |
17605ce48f74
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 ) { |
17605ce48f74
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", |
17605ce48f74
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: ")); |
17605ce48f74
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", |
17605ce48f74
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 @@ |
17605ce48f74
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 |
17605ce48f74
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. |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
27 |
*/ |
17605ce48f74
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; |
17605ce48f74
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; |
17605ce48f74
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; |
17605ce48f74
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, |
17605ce48f74
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); |
17605ce48f74
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); |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
34 |
} |
17605ce48f74
17962944 snmpd core dump at libnetsnmpmibs.so.15.1.0`mteTrigger_run
Mohana Rao Gorai <mohana.gorai@oracle.com>
parents:
diff
changeset
|
35 |
} |
17605ce48f74
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 */ |