upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure mdb_open actually got a sub-db record

Browse source
This commit is contained in:
Howard Chu 2011-09-29 21:07:07 -07:00
parent fa0d64242b
commit 19d1e72bbc
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libraries/libmdb/mdb.c
View file

@ -5642,7 +5642,8 @@ int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi)
{ {
MDB_val key, data; MDB_val key, data;
MDB_dbi i; MDB_dbi i;
int rc, dbflag = 0; MDB_cursor mc;
int rc, dbflag, exact;
size_t len; size_t len;
if (txn->mt_dbxs[FREE_DBI].md_cmp == NULL) { if (txn->mt_dbxs[FREE_DBI].md_cmp == NULL) {
@ -5676,20 +5677,25 @@ int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi)
return ENFILE; return ENFILE;
/* Find the DB info */ /* Find the DB info */
dbflag = 0;
exact = 0;
key.mv_size = len; key.mv_size = len;
key.mv_data = (void *)name; key.mv_data = (void *)name;
rc = mdb_get(txn, MAIN_DBI, &key, &data); mdb_cursor_init(&mc, txn, MAIN_DBI, NULL);
rc = mdb_cursor_set(&mc, &key, &data, MDB_SET, &exact);
/* Create if requested */ if (rc == MDB_SUCCESS) {
if (rc == MDB_NOTFOUND && (flags & MDB_CREATE)) { /* make sure this is actually a DB */
MDB_cursor mc; MDB_node *node = NODEPTR(mc.mc_pg[mc.mc_top], mc.mc_ki[mc.mc_top]);
if (!(node->mn_flags & F_SUBDATA))
return EINVAL;
} else if (rc == MDB_NOTFOUND && (flags & MDB_CREATE)) {
/* Create if requested */
MDB_db dummy; MDB_db dummy;
data.mv_size = sizeof(MDB_db); data.mv_size = sizeof(MDB_db);
data.mv_data = &dummy; data.mv_data = &dummy;
memset(&dummy, 0, sizeof(dummy)); memset(&dummy, 0, sizeof(dummy));
dummy.md_root = P_INVALID; dummy.md_root = P_INVALID;
dummy.md_flags = flags & 0xffff; dummy.md_flags = flags & 0xffff;
mdb_cursor_init(&mc, txn, MAIN_DBI, NULL);
rc = mdb_cursor_put(&mc, &key, &data, F_SUBDATA); rc = mdb_cursor_put(&mc, &key, &data, F_SUBDATA);
dbflag = DB_DIRTY; dbflag = DB_DIRTY;
} }