backport r1928729
merge: https://github.com/apache/apr-util/pull/14
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1928977 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dbm/apr_dbm_lmdb.c b/dbm/apr_dbm_lmdb.c
index 3702ded..f3ea1f4 100644
--- a/dbm/apr_dbm_lmdb.c
+++ b/dbm/apr_dbm_lmdb.c
@@ -41,8 +41,6 @@
#define APR_DBM_LMDBMODE_RO MDB_RDONLY
#define APR_DBM_LMDBMODE_RWCREATE MDB_CREATE
-#define APR_DBM_LMDBMODE_RW (MDB_RDONLY + MDB_CREATE + 1)
-#define APR_DBM_LMDBMODE_RWTRUNC (APR_DBM_LMDBMODE_RW + 1)
/* --------------------------------------------------------------------------
**
@@ -98,13 +96,13 @@
dbmode = APR_DBM_LMDBMODE_RO;
break;
case APR_DBM_READWRITE:
- dbmode = APR_DBM_LMDBMODE_RW;
+ dbmode = 0;
break;
case APR_DBM_RWCREATE:
dbi_open_flags = APR_DBM_LMDBMODE_RWCREATE;
break;
case APR_DBM_RWTRUNC:
- truncate = APR_DBM_LMDBMODE_RWTRUNC;
+ truncate = 1;
break;
default:
return APR_EINVAL;
@@ -124,14 +122,17 @@
}
if (dberr == 0) {
+ /* we pass MDB_RDONLY and the default */
dberr = mdb_env_open(file.env, pathname, dbmode | DEFAULT_ENV_FLAGS, apr_posix_perms2mode(perm));
}
if (dberr == 0) {
+ /* we pass MDB_RDONLY */
dberr = mdb_txn_begin(file.env, NULL, dbmode, &file.txn);
}
if (dberr == 0) {
+ /* we pass the DB_CREATE */
dberr = mdb_dbi_open(file.txn, NULL, dbi_open_flags, &file.dbi);
/* if mode == APR_DBM_RWTRUNC, drop database */
