upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-19 02:28:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix maxsize config, quick init

Browse source
This commit is contained in:
Howard Chu 2011-08-18 23:17:05 -07:00
parent 5172c4e0d3
commit dd24ca4ec8
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servers/slapd/back-mdb/config.c
View file

@ -315,6 +315,9 @@ mdb_cf_gen( ConfigArgs *c )
c->value_int = mdb->mi_search_stack_depth;
break;
case MDB_MAXSIZE:
c->value_int = mdb->mi_mapsize;
break;
}
return rc;
} else if ( c->op == LDAP_MOD_DELETE ) {
@ -330,6 +333,7 @@ mdb_cf_gen( ConfigArgs *c )
/* single-valued no-ops */
case MDB_SSTACK:
case MDB_MAXSIZE:
break;
case MDB_CHKPT:
@ -566,6 +570,13 @@ mdb_cf_gen( ConfigArgs *c )
}
mdb->mi_search_stack_depth = c->value_int;
break;
case MDB_MAXSIZE:
mdb->mi_mapsize = c->value_int;
if ( mdb->mi_flags & MDB_IS_OPEN )
mdb->mi_flags |= MDB_RE_OPEN;
break;
}
return 0;
}

4
servers/slapd/back-mdb/init.c
View file

@ -84,8 +84,6 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
char path[MAXPATHLEN];
char *dbhome;
Entry *e = NULL;
int alockt, quick = 0;
int do_retry = 1;
MDB_txn *txn;
if ( be->be_suffix == NULL ) {
@ -154,7 +152,7 @@ mdb_db_open( BackendDB *be, ConfigReply *cr )
flags = mdb->mi_dbenv_flags;
if ( quick )
if ( slapMode & SLAP_TOOL_QUICK )
flags |= MDB_NOSYNC;
if ( slapMode & SLAP_TOOL_READONLY)

2
servers/slapd/back-mdb/libmdb

@ -1 +1 @@
Subproject commit 15e30c02f66285ec3523fd942b9444cee20f1beb
Subproject commit d66b49284decb627c052b77678ffcabc2e229ba8