← Back to branch summary

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

« back to all changes in this revision

Viewing changes to agent/mibgroup/host/hr_storage.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/host/hr_storage.c
524
524
 
525
525
        store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
526
526
        if (HRFS_entry &&
 
527
            store_idx > NETSNMP_MEM_TYPE_MAX &&
527
528
            netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
528
529
                                   NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
529
530
            Check_HR_FileSys_NFS())
556
557
        if (store_idx > NETSNMP_MEM_TYPE_MAX)
557
558
            if (storageUseNFS && Check_HR_FileSys_NFS())
558
559
                storage_type_id[storage_type_len - 1] = 10;     /* Network Disk */
559
 
#if HAVE_HASMNTOPT
 
560
#if HAVE_HASMNTOPT && !(defined(aix4) || defined(aix5) || defined(aix6))
 
561
            /* 
 
562
             * hasmntopt takes "const struct mntent*", but HRFS_entry has been
 
563
             * defined differently for AIX, so skip this for AIX
 
564
             */
560
565
            else if (hasmntopt(HRFS_entry, "loop") != NULL)
561
566
                storage_type_id[storage_type_len - 1] = 5;      /* Removable Disk */
562
567
#endif