Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-mdb / config.c

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index 4041fabac6f57bcfd94b18f96c725154277e1e94..ec319ce70add557839e8b060ab355316e2f4477d 100644 (file)
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -38,7 +38,7 @@ enum {
        MDB_MAXREADERS,
        MDB_MAXSIZE,
        MDB_MODE,
-       MDB_SSTACK,
+       MDB_SSTACK
 };
 
 static ConfigTable mdbcfg[] = {
@@ -60,7 +60,7 @@ static ConfigTable mdbcfg[] = {
                "DESC 'Attribute index parameters' "
                "EQUALITY caseIgnoreMatch "
                "SYNTAX OMsDirectoryString )", NULL, NULL },
-       { "maxreaders", "num", 2, 2, 0, ARG_INT|ARG_MAGIC|MDB_MAXREADERS,
+       { "maxreaders", "num", 2, 2, 0, ARG_UINT|ARG_MAGIC|MDB_MAXREADERS,
                mdb_cf_gen, "( OLcfgDbAt:12.1 NAME 'olcDbMaxReaders' "
                "DESC 'Maximum number of threads that may access the DB concurrently' "
                "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
@@ -134,14 +134,13 @@ mdb_online_index( void *ctx, void *arg )
        op->o_bd = be;
 
        id = 1;
-       key.mv_data = &id;
        key.mv_size = sizeof(ID);
 
        while ( 1 ) {
                if ( slapd_shutdown )
                        break;
 
-               rc = mdb_txn_begin( mdb->mi_dbenv, 0, &txn );
+               rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
                if ( rc )
                        break;
                rc = mdb_cursor_open( txn, mdb->mi_id2entry, &curs );
@@ -151,6 +150,7 @@ mdb_online_index( void *ctx, void *arg )
                }
                if ( getnext ) {
                        getnext = 0;
+                       key.mv_data = &id;
                        rc = mdb_cursor_get( curs, &key, &data, MDB_SET_RANGE );
                        if ( rc ) {
                                mdb_txn_abort( txn );