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/index.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/index.c')
| -rw-r--r-- | usr.sbin/ldapd/index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ldapd/index.c b/usr.sbin/ldapd/index.c index 16408aed415..29bea2ceb33 100644 --- a/usr.sbin/ldapd/index.c +++ b/usr.sbin/ldapd/index.c @@ -1,4 +1,4 @@ -/* $OpenBSD: index.c,v 1.12 2018/06/28 02:41:49 gsoares Exp $ */ +/* $OpenBSD: index.c,v 1.13 2019/10/24 12:39:26 tb Exp $ */ /* * Copyright (c) 2009 Martin Hedenfalk <martin@bzero.se> @@ -103,7 +103,7 @@ index_attribute(struct namespace *ns, char *attr, struct btval *dn, dnsz = dn->size - strlen(ns->suffix); for (v = a->be_next->be_sub; v; v = v->be_next) { - if (ber_get_string(v, &s) != 0) + if (ober_get_string(v, &s) != 0) continue; memset(&key, 0, sizeof(key)); key.size = asprintf(&t, "%s=%s,%.*s", attr, s, dnsz, @@ -202,7 +202,7 @@ unindex_attribute(struct namespace *ns, char *attr, struct btval *dn, dnsz = dn->size - strlen(ns->suffix); for (v = a->be_next->be_sub; v; v = v->be_next) { - if (ber_get_string(v, &s) != 0) + if (ober_get_string(v, &s) != 0) continue; memset(&key, 0, sizeof(key)); key.size = asprintf(&t, "%s=%s,%.*s", attr, s, dnsz, |