commit 14b7c5bf1346c04b6613b01c9e4f8927f9743980
author Jan Safranek <jsafranek@users.sourceforge.net> Thu Jan 09 13:35:41 2014 +0100
committer Jan Safranek <jsafranek@users.sourceforge.net> Thu Jan 09 13:35:41 2014 +0100
tree 82f65b7ea2213edff9be82f92273839c6920d8d2
parent 2dd7dba76d1d0b4f866834e0fd60148c281a153c
parent 9f4c572614091404decba0d4ef1a4cbaf9fc5bd2

Merge branch 'V5-4-patches' into V5-5-patches

* V5-4-patches:
  CHANGES: snmpd: Fixed monitoring based on non-delta trigger.

agent/mibgroup/disman/event/mteTrigger.c

diff --git a/agent/mibgroup/disman/event/mteTrigger.c b/agent/mibgroup/disman/event/mteTrigger.c
index f0d4592..cf51edb 100644
--- a/agent/mibgroup/disman/event/mteTrigger.c
+++ b/agent/mibgroup/disman/event/mteTrigger.c
@@ -533,6 +533,13 @@
         } /* !old_results - end of else block */
     } /* MTE_TRIGGER_EXISTENCE */
 
+    /*
+     * We'll need sysUpTime.0 regardless...
+     */
+    DEBUGMSGTL(("disman:event:delta", "retrieve sysUpTime.0\n"));
+    memset( &sysUT_var, 0, sizeof( netsnmp_variable_list ));
+    snmp_set_var_objid( &sysUT_var, _sysUpTime_instance, _sysUpTime_inst_len );
+    netsnmp_query_get(  &sysUT_var, entry->session );
 
     if (( entry->mteTriggerTest & MTE_TRIGGER_BOOLEAN   ) ||
         ( entry->mteTriggerTest & MTE_TRIGGER_THRESHOLD )) {
@@ -582,14 +589,6 @@
          * (including sysUpTime.0 if not specified explicitly).
          */
         if ( entry->flags & MTE_TRIGGER_FLAG_DELTA ) {
-            /*
-             * We'll need sysUpTime.0 regardless...
-             */
-            DEBUGMSGTL(("disman:event:delta", "retrieve sysUpTime.0\n"));
-            memset( &sysUT_var, 0, sizeof( netsnmp_variable_list ));
-            snmp_set_var_objid( &sysUT_var, _sysUpTime_instance,
-                                            _sysUpTime_inst_len );
-            netsnmp_query_get(  &sysUT_var, entry->session );
 
             if (!(entry->flags & MTE_TRIGGER_FLAG_SYSUPT)) {
                 /*