← 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/schedule/schedCore.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/schedule/schedCore.c
463
463
     */
464
464
    if (schedOwner) {
465
465
        memcpy(entry->schedOwner, schedOwner, strlen(schedOwner));
 
466
        netsnmp_tdata_row_add_index(row, ASN_OCTET_STR,
 
467
                           entry->schedOwner, strlen(schedOwner));
466
468
    }
 
469
    else
 
470
        netsnmp_tdata_row_add_index(row, ASN_OCTET_STR, "", 0 );
 
471
 
467
472
    memcpy(    entry->schedName,  schedName,  strlen(schedName));
468
473
    netsnmp_tdata_row_add_index(row, ASN_OCTET_STR,
469
 
                                (entry->schedOwner || ""),
470
 
                                ((schedOwner) ? strlen(schedOwner) : 0));
471
 
    netsnmp_tdata_row_add_index(row, ASN_OCTET_STR,
472
 
                                entry->schedName,  strlen(schedName));
 
474
                           entry->schedName,  strlen(schedName));
473
475
    /*
474
476
     * Set the (non-zero) default values in the row data structure.
475
477
     */