A similar change was done to ber.c in ldapd by @mmcc.

I just copied those changes for snmpd and ypldap.

No binary change.

Regards,

Index: snmpd/ber.c
===================================================================
RCS file: /cvs/src/usr.sbin/snmpd/ber.c,v
retrieving revision 1.30
diff -u -p -r1.30 ber.c
--- snmpd/ber.c 5 Dec 2015 06:42:18 -0000       1.30
+++ snmpd/ber.c 4 Mar 2016 21:34:32 -0000
@@ -420,7 +420,7 @@ ber_string2oid(const char *oidstr, struc
 
        if (strlcpy(str, oidstr, sizeof(str)) >= sizeof(str))
                return (-1);
-       bzero(o, sizeof(*o));
+       memset(o, 0, sizeof(*o));
 
        /* Parse OID strings in the common forms n.n.n, n_n_n_n, or n-n-n */
        for (p = sp = str; p != NULL; sp = p) {
@@ -505,7 +505,7 @@ ber_get_oid(struct ber_element *elm, str
        if (!buf[i])
                return (-1);
 
-       bzero(o, sizeof(*o));
+       memset(o, 0, sizeof(*o));
        o->bo_id[j++] = buf[i] / 40;
        o->bo_id[j++] = buf[i++] % 40;
        for (; i < len && j < BER_MAX_OID_LEN; i++) {
@@ -639,7 +639,7 @@ ber_scanf_elements(struct ber_element *b
        struct ber_oid          *o;
        struct ber_element      *parent[_MAX_SEQ], **e;
 
-       bzero(parent, sizeof(struct ber_element *) * _MAX_SEQ);
+       memset(parent, 0, sizeof(struct ber_element *) * _MAX_SEQ);
 
        va_start(ap, fmt);
        while (*fmt) {

Index: ypldap/ber.c
===================================================================
RCS file: /cvs/src/usr.sbin/ypldap/ber.c,v
retrieving revision 1.10
diff -u -p -r1.10 ber.c
--- ypldap/ber.c        5 Dec 2015 19:10:19 -0000       1.10
+++ ypldap/ber.c        4 Mar 2016 21:34:33 -0000
@@ -420,7 +420,7 @@ ber_string2oid(const char *oidstr, struc
 
        if (strlcpy(str, oidstr, sizeof(str)) >= sizeof(str))
                return (-1);
-       bzero(o, sizeof(*o));
+       memset(o, 0, sizeof(*o));
 
        /* Parse OID strings in the common forms n.n.n, n_n_n_n, or n-n-n */
        for (p = sp = str; p != NULL; sp = p) {
@@ -505,7 +505,7 @@ ber_get_oid(struct ber_element *elm, str
        if (!buf[i])
                return (-1);
 
-       bzero(o, sizeof(*o));
+       memset(o, 0, sizeof(*o));
        o->bo_id[j++] = buf[i] / 40;
        o->bo_id[j++] = buf[i++] % 40;
        for (; i < len && j < BER_MAX_OID_LEN; i++) {
@@ -638,7 +638,7 @@ ber_scanf_elements(struct ber_element *b
        struct ber_oid          *o;
        struct ber_element      *parent[_MAX_SEQ], **e;
 
-       bzero(parent, sizeof(struct ber_element *) * _MAX_SEQ);
+       memset(parent, 0, sizeof(struct ber_element *) * _MAX_SEQ);
 
        va_start(ap, fmt);
        while (*fmt) {

Reply via email to