From: Howard Chu <hyc@symas.com>
Date: Thu, 3 Jul 2014 15:31:57 +0000 (-0700)
Subject: Fix envinfo to return fixed map address
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~127^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6043103c1311e278b255f5881393cea4704af225;p=openldap

Fix envinfo to return fixed map address
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index a90372f34a..d64c954990 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8671,7 +8671,7 @@ mdb_env_info(MDB_env *env, MDB_envinfo *arg)
 		return EINVAL;
 
 	toggle = mdb_env_pick_meta(env);
-	arg->me_mapaddr = (env->me_flags & MDB_FIXEDMAP) ? env->me_map : 0;
+	arg->me_mapaddr = env->me_metas[toggle]->mm_address;
 	arg->me_mapsize = env->me_mapsize;
 	arg->me_maxreaders = env->me_maxreaders;