← Back to branch summary

~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to agent/mibgroup/disman/mteTriggerTable.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/mibgroup/disman/mteTriggerTable.c
192
192
    se_add_pair_to_slist("mteBooleanOperators", strdup(">="),
193
193
                         MTETRIGGERBOOLEANCOMPARISON_GREATEROREQUAL);
194
194
 
195
 
#ifdef NETSNMP_TRANSPORT_CALLBACK_DOMAIN
196
 
    /*
197
 
     * open a 'callback' session to the main agent 
198
 
     */
199
 
    if (mte_callback_sess == NULL) {
200
 
        mte_callback_sess = netsnmp_callback_open(callback_master_num,
201
 
                                                  NULL, NULL, NULL);
202
 
        DEBUGMSGTL(("mteTriggerTable", "created callback session = %08x\n",
203
 
                    mte_callback_sess));
204
 
    }
205
 
#endif
206
195
    DEBUGMSGTL(("mteTriggerTable", "done.\n"));
207
196
}
208
197
 
3063
3052
         * send to the local agent 
3064
3053
         */
3065
3054
 
 
3055
        if (mte_callback_sess == NULL)
 
3056
            mte_callback_sess =  netsnmp_query_get_default_session();
 
3057
        if (!mte_callback_sess)
 
3058
            return NULL;
 
3059
 
3066
3060
        status = snmp_synch_response(mte_callback_sess, pdu, &response);
3067
3061
 
3068
3062
        if (status != SNMP_ERR_NOERROR ||