summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ldapd/namespace.c
diff options
context:
space:
mode:
authormartinh <martinh@openbsd.org>2010-06-11 08:45:06 +0000
committermartinh <martinh@openbsd.org>2010-06-11 08:45:06 +0000
commitb91780d151009956200e947d2c247f327e4300a0 (patch)
tree2cb5ad3ff310b6f20cc770a97fd489fb85bd97f1 /usr.sbin/ldapd/namespace.c
parentKeep returning BT_DEAD if last meta page has the "tombstone" bit set. (diff)
downloadwireguard-openbsd-b91780d151009956200e947d2c247f327e4300a0.tar.xz
wireguard-openbsd-b91780d151009956200e947d2c247f327e4300a0.zip
Track changes in btree_txn_* API, pass a NULL btree when also passing a
transaction.
Diffstat (limited to 'usr.sbin/ldapd/namespace.c')
-rw-r--r--usr.sbin/ldapd/namespace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ldapd/namespace.c b/usr.sbin/ldapd/namespace.c
index 28e1e0364d5..1cf20acb41e 100644
--- a/usr.sbin/ldapd/namespace.c
+++ b/usr.sbin/ldapd/namespace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: namespace.c,v 1.3 2010/06/03 17:29:54 martinh Exp $ */
+/* $OpenBSD: namespace.c,v 1.4 2010/06/11 08:45:06 martinh Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -389,7 +389,7 @@ namespace_put(struct namespace *ns, char *dn, struct ber_element *root,
if (namespace_begin(ns) != 0)
return BT_FAIL;
- rc = btree_txn_put(ns->data_db, ns->data_txn, &key, &val,
+ rc = btree_txn_put(NULL, ns->data_txn, &key, &val,
update ? 0 : BT_NOOVERWRITE);
if (rc != BT_SUCCESS) {
if (rc == BT_EXISTS)
@@ -452,7 +452,7 @@ namespace_del(struct namespace *ns, char *dn)
if (namespace_begin(ns) != 0)
return BT_FAIL;
- rc = btree_txn_del(ns->data_db, ns->data_txn, &key, &data);
+ rc = btree_txn_del(NULL, ns->data_txn, &key, &data);
if (rc != BT_SUCCESS)
goto fail;