diff options
| author |   tb <tb@openbsd.org> | 2019-10-24 12:39:26 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2019-10-24 12:39:26 +0000 |
| commit | 696b58997f75587bd78112ed0b6cdec94a718911 (patch) | |
| tree | 113a47b65d3d84619d15dd5ba9050be9ee77cc1b /usr.sbin/ldapd/util.c | |
| parent | Backout previous synch.h commit (r1.5, "Use process-private futexes to avoid (diff) | |
| download | wireguard-openbsd-696b58997f75587bd78112ed0b6cdec94a718911.tar.xz wireguard-openbsd-696b58997f75587bd78112ed0b6cdec94a718911.zip | |
The ber_* namespace is used by liblber since time immemorial,
so move our BER API to the unused ober_* prefix to avoid some
breakage in ports.
Problem diagnosed by jmatthew with ber_free() in samba, but
there are many others as pointed out by sthen.
tests & ok rob
ok sthen (who had an almost identical diff for libutil)
"go head hit it" deraadt
Diffstat (limited to 'usr.sbin/ldapd/util.c')
| -rw-r--r-- | usr.sbin/ldapd/util.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/ldapd/util.c b/usr.sbin/ldapd/util.c index cc94ebf74d2..3f5d74d0a3c 100644 --- a/usr.sbin/ldapd/util.c +++ b/usr.sbin/ldapd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.11 2019/07/03 03:24:03 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.12 2019/10/24 12:39:26 tb Exp $ */ /* * Copyright (c) 2009 Martin Hedenfalk <martin@bzero.se> @@ -113,9 +113,9 @@ ber2db(struct ber_element *root, struct btval *val, int compression_level) memset(val, 0, sizeof(*val)); memset(&ber, 0, sizeof(ber)); - ber_write_elements(&ber, root); + ober_write_elements(&ber, root); - if ((len = ber_get_writebuf(&ber, &buf)) == -1) + if ((len = ober_get_writebuf(&ber, &buf)) == -1) return -1; if (compression_level > 0) { @@ -123,7 +123,7 @@ ber2db(struct ber_element *root, struct btval *val, int compression_level) val->data = malloc(val->size + sizeof(uint32_t)); if (val->data == NULL) { log_warn("malloc(%zu)", val->size + sizeof(uint32_t)); - ber_free(&ber); + ober_free(&ber); return -1; } dest = (char *)val->data + sizeof(uint32_t); @@ -132,7 +132,7 @@ ber2db(struct ber_element *root, struct btval *val, int compression_level) compression_level)) != Z_OK) { log_warn("compress returned %d", rc); free(val->data); - ber_free(&ber); + ober_free(&ber); return -1; } log_debug("compressed entry from %zd -> %lu byte", @@ -148,7 +148,7 @@ ber2db(struct ber_element *root, struct btval *val, int compression_level) ber.br_wbuf = NULL; } - ber_free(&ber); + ober_free(&ber); return 0; } @@ -190,13 +190,13 @@ db2ber(struct btval *val, int compression_level) log_debug("uncompressed entry from %zu -> %lu byte", val->size, len); - ber_set_readbuf(&ber, buf, len); - elm = ber_read_elements(&ber, NULL); + ober_set_readbuf(&ber, buf, len); + elm = ober_read_elements(&ber, NULL); free(buf); return elm; } else { - ber_set_readbuf(&ber, val->data, val->size); - return ber_read_elements(&ber, NULL); + ober_set_readbuf(&ber, val->data, val->size); + return ober_read_elements(&ber, NULL); } } |