diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-03-05 03:31:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-03-05 03:31:40 +0000 |
| commit | 5645289f4e598bb3e6d5df84002e7579079a6e9d (patch) | |
| tree | 4df1448064d614644b42daddacb77d49586ca090 /usr.sbin | |
| parent | 8d03c28fd084fcef89aa953a184957b1b7dbf273 (diff) | |
mirror memset changes to ber.c made in ldapd (these 3 daemons
have subtly modified copies of the file)
from rob pierce
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/snmpd/ber.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ypldap/ber.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/snmpd/ber.c b/usr.sbin/snmpd/ber.c index 7c3a48ecd69..54ee0831809 100644 --- a/usr.sbin/snmpd/ber.c +++ b/usr.sbin/snmpd/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.30 2015/12/05 06:42:18 mmcc Exp $ */ +/* $OpenBSD: ber.c,v 1.31 2016/03/05 03:31:36 deraadt Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org> @@ -420,7 +420,7 @@ ber_string2oid(const char *oidstr, struct ber_oid *o) 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, struct ber_oid *o) 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 *ber, char *fmt, ...) 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) { diff --git a/usr.sbin/ypldap/ber.c b/usr.sbin/ypldap/ber.c index 2edc2bffbaf..ca39d10aa71 100644 --- a/usr.sbin/ypldap/ber.c +++ b/usr.sbin/ypldap/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.10 2015/12/05 19:10:19 mmcc Exp $ */ +/* $OpenBSD: ber.c,v 1.11 2016/03/05 03:31:39 deraadt Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@vantronix.net> @@ -420,7 +420,7 @@ ber_string2oid(const char *oidstr, struct ber_oid *o) 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, struct ber_oid *o) 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 *ber, char *fmt, ...) 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) { |