From: Howard Chu <highlandsun@gmail.com>
Date: Fri, 19 Aug 2011 06:17:05 +0000 (-0700)
Subject: Fix maxsize config, quick init
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd24ca4ec8c051d252c7d3aa7673531e8bfbb443;p=thirdparty%2Fopenldap.git

Fix maxsize config, quick init
---

diff --git a/servers/slapd/back-mdb/config.c b/servers/slapd/back-mdb/config.c
index d40fba973f..3175172e2e 100644
--- a/servers/slapd/back-mdb/config.c
+++ b/servers/slapd/back-mdb/config.c
@@ -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;
 }
diff --git a/servers/slapd/back-mdb/init.c b/servers/slapd/back-mdb/init.c
index e51b34bd62..4f8972f762 100644
--- a/servers/slapd/back-mdb/init.c
+++ b/servers/slapd/back-mdb/init.c
@@ -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)
diff --git a/servers/slapd/back-mdb/libmdb b/servers/slapd/back-mdb/libmdb
index 15e30c02f6..d66b49284d 160000
--- a/servers/slapd/back-mdb/libmdb
+++ b/servers/slapd/back-mdb/libmdb
@@ -1 +1 @@
-Subproject commit 15e30c02f66285ec3523fd942b9444cee20f1beb
+Subproject commit d66b49284decb627c052b77678ffcabc2e229ba8