← Back to branch summary

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

« back to all changes in this revision

Viewing changes to agent/mibgroup/snmpv3/usmUser.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/snmpv3/usmUser.c
988
988
                     usmNoPrivProtocol,
989
989
                     sizeof(usmNoPrivProtocol) / sizeof(oid)) != 0
990
990
#ifndef NETSNMP_DISABLE_DES
991
 
                    && snmp_oid_compare((oid *) var_val,
992
 
                                        var_val_len / sizeof(oid),
993
 
                                        usmDESPrivProtocol,
994
 
                                        sizeof(usmDESPrivProtocol) /
995
 
                                        sizeof(oid) != 0)
 
991
                 && snmp_oid_compare
 
992
                    ((oid *) var_val, var_val_len / sizeof(oid),
 
993
                     usmDESPrivProtocol,
 
994
                     sizeof(usmDESPrivProtocol) / sizeof(oid)) != 0
996
995
#endif
997
 
                    && snmp_oid_compare((oid *) var_val,
998
 
                                        var_val_len / sizeof(oid),
999
 
                                        usmAESPrivProtocol,
1000
 
                                        sizeof(usmAESPrivProtocol) /
1001
 
                                        sizeof(oid) != 0)) {
 
996
                 && snmp_oid_compare
 
997
                    ((oid *) var_val, var_val_len / sizeof(oid),
 
998
                     usmAESPrivProtocol,
 
999
                     sizeof(usmAESPrivProtocol) / sizeof(oid)) != 0) {
1002
1000
                    return SNMP_ERR_WRONGVALUE;
1003
1001
                }
1004
1002
            }