← Back to branch summary

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

« back to all changes in this revision

Viewing changes to agent/mibgroup/utilities/iquery.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/utilities/iquery.c
61
61
    if (secName)
62
62
        netsnmp_query_set_default_session(
63
63
             netsnmp_iquery_user_session(secName));
 
64
    else
 
65
        snmp_log(LOG_WARNING,
 
66
                 "iquerySecName has not been configured - internal queries will fail\n");
64
67
    return SNMPERR_SUCCESS;
65
68
}
66
69
 
186
189
        ss->securityEngineIDLen = engIDLen;
187
190
        if ( version == SNMP_VERSION_3 ) {
188
191
            ss->securityNameLen = strlen(secName);
189
 
            memdup(&(ss->securityName), (u_char*)secName, ss->securityNameLen);
 
192
            memdup((u_char**)&(ss->securityName), (u_char*)secName, ss->securityNameLen);
190
193
        } else {
191
194
            memdup( &(ss->community), secName, strlen(secName));
192
195
            ss->community_len = strlen(secName);