upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mdb_env_open(): Keep mdb_env_set_flags() flags.

Browse source
This commit is contained in:
Hallvard Furuseth 2012-10-15 17:04:11 +02:00
parent 092f9a5c66
commit e9d87866c4
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/libmdb/mdb.c
View file

@ -3155,6 +3155,7 @@ mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode)
sprintf(dpath, "%s" DATANAME, path); sprintf(dpath, "%s" DATANAME, path);
} }
flags |= env->me_flags;
/* silently ignore WRITEMAP if we're only getting read access */ /* silently ignore WRITEMAP if we're only getting read access */
if (F_ISSET(flags, MDB_RDONLY|MDB_WRITEMAP)) if (F_ISSET(flags, MDB_RDONLY|MDB_WRITEMAP))
flags ^= MDB_WRITEMAP; flags ^= MDB_WRITEMAP;

3
libraries/libmdb/mdb.h
View file

@ -401,6 +401,7 @@ int mdb_env_create(MDB_env **env);
* @param[in] flags Special options for this environment. This parameter * @param[in] flags Special options for this environment. This parameter
* must be set to 0 or by bitwise OR'ing together one or more of the * must be set to 0 or by bitwise OR'ing together one or more of the
* values described here. * values described here.
* Flags set by mdb_env_set_flags() are also used.
* <ul> * <ul>
* <li>#MDB_FIXEDMAP * <li>#MDB_FIXEDMAP
* use a fixed address for the mmap region. This flag must be specified * use a fixed address for the mmap region. This flag must be specified
@ -501,7 +502,7 @@ void mdb_env_close(MDB_env *env);
/** @brief Set environment flags. /** @brief Set environment flags.
* *
* This may be used to set some flags that weren't already set during * This may be used to set some flags in addition to those from
* #mdb_env_open(), or to unset these flags. * #mdb_env_open(), or to unset these flags.
* @param[in] env An environment handle returned by #mdb_env_create() * @param[in] env An environment handle returned by #mdb_env_create()
* @param[in] flags The flags to change, bitwise OR'ed together * @param[in] flags The flags to change, bitwise OR'ed together