From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 29 Jul 2017 14:31:06 +0000 (+0200)
Subject: Expose MDB_ENCRYPT flag
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ddec0bb453579ebbaf2059f05ad639122b5882;p=thirdparty%2Fopenldap.git

Expose MDB_ENCRYPT flag
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 9d20799be2..0911bbb6d6 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -5707,8 +5707,9 @@ mdb_env_envflags(MDB_env *env)
 #define	CHANGEABLE	(MDB_NOSYNC|MDB_NOMETASYNC|MDB_MAPASYNC|MDB_NOMEMINIT)
 #define	CHANGELESS	(MDB_FIXEDMAP|MDB_NOSUBDIR|MDB_RDONLY| \
 	MDB_WRITEMAP|MDB_NOTLS|MDB_NOLOCK|MDB_NORDAHEAD|MDB_REMAP_CHUNKS)
+#define EXPOSED		(CHANGEABLE|CHANGELESS | MDB_ENCRYPT)
 
-#if VALID_FLAGS & PERSISTENT_FLAGS & (CHANGEABLE|CHANGELESS)
+#if VALID_FLAGS & PERSISTENT_FLAGS & EXPOSED
 # error "Persistent DB flags & env flags overlap, but both go in mm_flags"
 #endif
 
@@ -10909,7 +10910,7 @@ mdb_env_get_flags(MDB_env *env, unsigned int *arg)
 	if (!env || !arg)
 		return EINVAL;
 
-	*arg = env->me_flags & (CHANGEABLE|CHANGELESS);
+	*arg = env->me_flags & EXPOSED;
 	return MDB_SUCCESS;
 }