← Back to branch summary

~ubuntu-branches/ubuntu/precise/net-snmp/precise

« back to all changes in this revision

Viewing changes to agent/mibgroup/disman/event/mteTriggerConf.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-11-26 01:27:00 UTC
  • mfrom: (1.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091126012700-pox7w0a5j2x305h9
Tags: 5.4.2.1~dfsg-3ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/426813
* Merge from debian testing.  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/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.
    (LP: #426813).
 * Dropped patches:
   - debian/patches/101-fix-ipalias.patch: Applied upstream.
   - debian/patches/99-fix-net-snmp-syslog.patch: Applied upstream.
   - debian/patches/99-fix-perl-counter-in-subagent.patch: Applied upstream.
   - ebian/patches/103-fix-ubuntu-lmsensors.patch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
agent/mibgroup/disman/event/mteTriggerConf.c
743
743
    if (strncmp( line, "yes", 3) == 0) {
744
744
        DEBUGMSGTL(("disman:event:conf", "Registering linkUpDown traps\n"));
745
745
 
746
 
        parse_mteMonitor("monitor",
747
 
            "-r 60 -S -e _linkUp   \"linkUp\"   ifOperStatus != 2");
748
 
        parse_mteMonitor("monitor",
749
 
            "-r 60 -S -e _linkDown \"linkDown\" ifOperStatus == 2");
 
746
        /* ifOperStatus */
 
747
        parse_mteMonitor("monitor",
 
748
            "-r 60 -S -e _linkUp   \"linkUp\"   .1.3.6.1.2.1.2.2.1.8 != 2");
 
749
        parse_mteMonitor("monitor",
 
750
            "-r 60 -S -e _linkDown \"linkDown\" .1.3.6.1.2.1.2.2.1.8 == 2");
750
751
    }
751
752
}
752
753
 
768
769
        parse_mteMonitor("monitor",
769
770
            "-o laNames -o laErrMessage   \"laTable\"       laErrorFlag  != 0");
770
771
        parse_mteMonitor("monitor",
771
 
            "-o fileName -o fileErrorMsg  \"fileTable\" fileErrorFlag    != 0");
 
772
            "-o fileName -o fileErrorMsg  \"fileTable\"    fileErrorFlag != 0");
772
773
        parse_mteMonitor("monitor",
773
774
            "-o snmperrErrMessage         \"snmperrs\"  snmperrErrorFlag != 0");
774
775
    }