summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ldapd/namespace.c
diff options
context:
space:
mode:
authormmcc <mmcc@openbsd.org>2015-12-24 17:47:57 +0000
committermmcc <mmcc@openbsd.org>2015-12-24 17:47:57 +0000
commit37f4b93331655ae7b7984001a6fcc0bd76cae2c5 (patch)
tree42bcfe06859edd7b528fe8219f064d5db71ca7a5 /usr.sbin/ldapd/namespace.c
parentuse strndup instead of malloc/strncpy/nul (diff)
downloadwireguard-openbsd-37f4b93331655ae7b7984001a6fcc0bd76cae2c5.tar.xz
wireguard-openbsd-37f4b93331655ae7b7984001a6fcc0bd76cae2c5.zip
bzero -> memset. No binary change.
Diffstat (limited to 'usr.sbin/ldapd/namespace.c')
-rw-r--r--usr.sbin/ldapd/namespace.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/ldapd/namespace.c b/usr.sbin/ldapd/namespace.c
index 23fb2c3b33b..de1a1a6ec5f 100644
--- a/usr.sbin/ldapd/namespace.c
+++ b/usr.sbin/ldapd/namespace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: namespace.c,v 1.13 2014/09/13 16:06:37 doug Exp $ */
+/* $OpenBSD: namespace.c,v 1.14 2015/12/24 17:47:57 mmcc Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -145,7 +145,7 @@ namespace_reopen(const char *path)
log_debug("asking parent to open %s", path);
- bzero(&req, sizeof(req));
+ memset(&req, 0, sizeof(req));
if (strlcpy(req.path, path, sizeof(req.path)) >= sizeof(req.path)) {
log_warnx("%s: path truncated", __func__);
return -1;
@@ -260,8 +260,8 @@ namespace_find(struct namespace *ns, char *dn)
return NULL;
}
- bzero(&key, sizeof(key));
- bzero(&val, sizeof(val));
+ memset(&key, 0, sizeof(key));
+ memset(&val, 0, sizeof(val));
key.data = dn;
key.size = strlen(dn);
@@ -330,7 +330,7 @@ namespace_put(struct namespace *ns, char *dn, struct ber_element *root,
assert(ns->data_txn != NULL);
assert(ns->indx_txn != NULL);
- bzero(&key, sizeof(key));
+ memset(&key, 0, sizeof(key));
key.data = dn;
key.size = strlen(dn);
@@ -382,8 +382,8 @@ namespace_del(struct namespace *ns, char *dn)
assert(ns->indx_txn != NULL);
assert(ns->data_txn != NULL);
- bzero(&key, sizeof(key));
- bzero(&data, sizeof(data));
+ memset(&key, 0, sizeof(key));
+ memset(&data, 0, sizeof(data));
key.data = dn;
key.size = strlen(key.data);