From: Howard Chu <hyc@symas.com>
Date: Mon, 14 Jul 2014 16:51:16 +0000 (-0700)
Subject: ITS#7896 fix for mdb_env_map
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~123^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9049efe4933b35250a5406f746731ed9f60db60d;p=openldap

ITS#7896 fix for mdb_env_map

Don't pass non-NULL map address unless MDB_FIXEDMAP was used.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index f8c94e3100..4a21242239 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -3841,7 +3841,7 @@ mdb_env_open2(MDB_env *env)
 			env->me_flags |= MDB_RESIZING;
 	}
 
-	rc = mdb_env_map(env, meta.mm_address);
+	rc = mdb_env_map(env, (flags & MDB_FIXEDMAP) ? meta.mm_address : NULL);
 	if (rc)
 		return rc;