]> git.sur5r.net Git - openldap/log
openldap
10 years agoITS#7725
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:29:35 +0000 (09:29 -0700)]
ITS#7725

10 years agoITS#7725 add nordahead envflag
Howard Chu [Sat, 12 Oct 2013 23:25:33 +0000 (16:25 -0700)]
ITS#7725 add nordahead envflag

10 years agoITS#7692
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:21:20 +0000 (09:21 -0700)]
ITS#7692

10 years agoITS#7692 no-op if target entry doesn't exist
Howard Chu [Sat, 12 Oct 2013 22:30:05 +0000 (15:30 -0700)]
ITS#7692 no-op if target entry doesn't exist

10 years agoITS#7699
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:18:14 +0000 (09:18 -0700)]
ITS#7699

10 years agoITS#7699 fixed one dds start-up assertion failure
Ted C. Cheng [Wed, 18 Sep 2013 22:33:17 +0000 (15:33 -0700)]
ITS#7699 fixed one dds start-up assertion failure

10 years agoITS#7589
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:16:31 +0000 (09:16 -0700)]
ITS#7589

10 years agoITS#7722
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:14:22 +0000 (09:14 -0700)]
ITS#7722

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 14 Oct 2013 16:04:26 +0000 (09:04 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7725 add MDB_NORDAHEAD flag for env_open
Howard Chu [Sat, 12 Oct 2013 23:20:04 +0000 (16:20 -0700)]
ITS#7725 add MDB_NORDAHEAD flag for env_open

10 years agoITS#7589 silence warnings
Howard Chu [Sat, 12 Oct 2013 20:40:28 +0000 (13:40 -0700)]
ITS#7589 silence warnings

10 years agoITS#7589 Fix typo in prev commit
Howard Chu [Sat, 12 Oct 2013 20:31:09 +0000 (13:31 -0700)]
ITS#7589 Fix typo in prev commit

10 years agoITS#7589 Cleanup unneeded vars in prev patch
Howard Chu [Sat, 12 Oct 2013 20:19:33 +0000 (13:19 -0700)]
ITS#7589 Cleanup unneeded vars in prev patch

10 years agoITS#7589 avoid wasting space in mdb_page_split
Howard Chu [Sat, 12 Oct 2013 16:34:40 +0000 (09:34 -0700)]
ITS#7589 avoid wasting space in mdb_page_split

Also, check the split point on branch pages as well as leaf pages.

10 years agoAdd MDB_USE_HASH
Howard Chu [Fri, 4 Oct 2013 17:22:14 +0000 (10:22 -0700)]
Add MDB_USE_HASH

There may be other uses for it besides semaphore names.

10 years agoITS#7695
Quanah Gibson-Mount [Thu, 10 Oct 2013 18:10:09 +0000 (11:10 -0700)]
ITS#7695

10 years agoFrom: Stef Walter <stefw@redhat.com>
Quanah Gibson-Mount [Thu, 10 Oct 2013 18:07:57 +0000 (11:07 -0700)]
From: Stef Walter <stefw@redhat.com>
ITS#7695 Fix ldapsearch regression with CLDAP

Don't try to parse the result of a CLDAP bind request. Since these are
faked, no message is actually returned.

10 years agoITS#7694 more for IPv6 CLDAP, slapd fix
Howard Chu [Thu, 10 Oct 2013 17:48:08 +0000 (10:48 -0700)]
ITS#7694 more for IPv6 CLDAP, slapd fix

10 years agoITS#7694 Fix use of IPv6 with LDAP_CONNECTIONLESS
Stef Walter [Thu, 12 Sep 2013 13:49:36 +0000 (15:49 +0200)]
ITS#7694 Fix use of IPv6 with LDAP_CONNECTIONLESS

LDAP_CONNECTIONLESS code assumed that the size of an peer address
is equal to or smaller than sizeof (struct sockaddr).

Fix to use struct sockaddr_storage instead which is intended for
this purpose. Use getnameinfo() where appropriate so we don't
assume anything about the contents of struct sockaddr

10 years agoITS#7710 fix typo
Howard Chu [Thu, 10 Oct 2013 11:04:44 +0000 (04:04 -0700)]
ITS#7710 fix typo

10 years agoITS#7329, ITS#7710
Quanah Gibson-Mount [Wed, 9 Oct 2013 16:25:12 +0000 (09:25 -0700)]
ITS#7329, ITS#7710

10 years agoITS#7329 optimize index update for simple add ops
Howard Chu [Wed, 9 Oct 2013 14:55:50 +0000 (07:55 -0700)]
ITS#7329 optimize index update for simple add ops

Don't need to reindex all the attr values if there were no deletes.

10 years agoITS#7710 fix for non-replicated internal ops
Howard Chu [Wed, 9 Oct 2013 11:58:37 +0000 (04:58 -0700)]
ITS#7710 fix for non-replicated internal ops

Their completion was making slap_graduate_commit_csn() cleanup
their parent op's CSN, thus preventing that CSN from propagating
to any consumers.

10 years agoITS#7722 fix page_merge for collapsing root
Howard Chu [Wed, 9 Oct 2013 09:24:45 +0000 (02:24 -0700)]
ITS#7722 fix page_merge for collapsing root

Other cursors being fixed up are not necessarily height 1.

10 years agoITS#7720
Quanah Gibson-Mount [Tue, 8 Oct 2013 18:19:47 +0000 (11:19 -0700)]
ITS#7720

10 years agoITS#7720 don't do ptr arithmetic on void *s
Howard Chu [Tue, 8 Oct 2013 17:40:51 +0000 (10:40 -0700)]
ITS#7720 don't do ptr arithmetic on void *s

10 years agoITS#7712
Quanah Gibson-Mount [Tue, 8 Oct 2013 16:59:56 +0000 (09:59 -0700)]
ITS#7712

10 years agoITS#7712 Fix lock ordering in libldap abandon
Emily Backes [Mon, 30 Sep 2013 22:14:22 +0000 (15:14 -0700)]
ITS#7712 Fix lock ordering in libldap abandon

10 years agoITS#7715, ITS#7718
Quanah Gibson-Mount [Tue, 8 Oct 2013 16:56:01 +0000 (09:56 -0700)]
ITS#7715, ITS#7718

10 years agoFix modrdn unique check
Howard Chu [Thu, 19 Sep 2013 22:58:40 +0000 (15:58 -0700)]
Fix modrdn unique check

Just check normalized name match. Case-changes are allowed.

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 8 Oct 2013 16:06:35 +0000 (09:06 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7718 invalidate cursor when DB gets emptied
Howard Chu [Tue, 8 Oct 2013 11:43:58 +0000 (04:43 -0700)]
ITS#7718 invalidate cursor when DB gets emptied

10 years agoFix mdb_env_set_mapsize()
Howard Chu [Fri, 4 Oct 2013 09:55:34 +0000 (02:55 -0700)]
Fix mdb_env_set_mapsize()

Don't allow shrinking below minimum size for an already open env.

10 years agoITS#7715 always set filesize for WRITEMAP
Howard Chu [Fri, 4 Oct 2013 09:46:38 +0000 (02:46 -0700)]
ITS#7715 always set filesize for WRITEMAP

10 years agoAdd Caveat: Readers need write access. Whitespace.
Hallvard Furuseth [Thu, 3 Oct 2013 22:48:19 +0000 (00:48 +0200)]
Add Caveat: Readers need write access. Whitespace.

10 years agoMaintain MDB_cursor.mc_top
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:25 +0000 (23:59 +0200)]
Maintain MDB_cursor.mc_top

10 years agomdb_cursor_sibling(): Fix error result
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:25 +0000 (23:59 +0200)]
mdb_cursor_sibling(): Fix error result

10 years agomdb_node_add(): Plug page leak when MDB_PAGE_FULL.
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:25 +0000 (23:59 +0200)]
mdb_node_add(): Plug page leak when MDB_PAGE_FULL.

Do not fail after mdb_page_new() succeeds.

10 years agoOptimize code holding reader mutex
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:24 +0000 (23:59 +0200)]
Optimize code holding reader mutex

10 years agoSet MDB_xcursor DB_DIRTY, clear md_name.
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:24 +0000 (23:59 +0200)]
Set MDB_xcursor DB_DIRTY, clear md_name.

Both were unused and md_name was unmaintained -- except
mdb_cursor_touch(xcursor) would abuse md_name as a key to
touch MAIN_DBI if it could somehow get passed ! DB_DIRTY.

10 years agoSet subDB DBI=parent DBI, fix MDB_DUPSORT delete.
Hallvard Furuseth [Thu, 3 Oct 2013 21:59:24 +0000 (23:59 +0200)]
Set subDB DBI=parent DBI, fix MDB_DUPSORT delete.

xcursor DBIs were parent DBI+1 for debugging. Instead output
-(parent DBI).  Fixes a crash in mdb_cursor_del0()'s xcursor
tracking, it forgot to subtract 1 for C_SUB cursors.

10 years agos/MDB_NORDLOCK/MDB_NOLOCK/
Howard Chu [Thu, 3 Oct 2013 17:26:44 +0000 (10:26 -0700)]
s/MDB_NORDLOCK/MDB_NOLOCK/

Leave all lock management to the caller.

10 years agoMore doc for MDB_NORDLOCK
Howard Chu [Wed, 2 Oct 2013 06:36:57 +0000 (23:36 -0700)]
More doc for MDB_NORDLOCK

10 years agoAdd MDB_NORDLOCK to omit all reader table usage
Howard Chu [Tue, 1 Oct 2013 20:16:38 +0000 (13:16 -0700)]
Add MDB_NORDLOCK to omit all reader table usage

Calling app wants to manage its own locking.

10 years agoDrop unneeded code.
Hallvard Furuseth [Mon, 23 Sep 2013 18:21:11 +0000 (20:21 +0200)]
Drop unneeded code.

MDB_txn.mt_toggle: Use (mt_txnid & 1) instead.
Drop error checks which will be repeated.
mdb_cursor_set(): Turn assert into if/return to match the above.
mdb_cursor_del(): 'flags' are now used as bitflags.

10 years agoClean up and simplify mdb_page_search().
Hallvard Furuseth [Mon, 23 Sep 2013 18:21:11 +0000 (20:21 +0200)]
Clean up and simplify mdb_page_search().

Only named DBs can have DB_STALE, and they do not use MDB_PS_MODIFY.
Replace magic key values with flags.  Drop duplicated comments at
mdb_page_search_root() vs. mdb_page_search(), and rephrase.

10 years agoTweak MDB_DEBUG output
Hallvard Furuseth [Mon, 23 Sep 2013 18:20:42 +0000 (20:20 +0200)]
Tweak MDB_DEBUG output

10 years agoRename SWAP() to avoid conflict with sqlightning.
Hallvard Furuseth [Mon, 23 Sep 2013 18:20:05 +0000 (20:20 +0200)]
Rename SWAP() to avoid conflict with sqlightning.

Happened since sqlightning #includes mdb.c, midl.c.

10 years agomdb_page_unspill(): Rename local vars.
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
mdb_page_unspill(): Rename local vars.

The names have caused bugs, "txn" was treated as
the current transaction.

10 years agoITS#7515 Fix mdb_page_unspill() in nested txn.
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
ITS#7515 Fix mdb_page_unspill() in nested txn.

Malloc a page in this txn, not in a parent.

10 years agoITS#7515 Fix mdb_txn_commit(nested txn with spills).
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
ITS#7515 Fix mdb_txn_commit(nested txn with spills).

Catch malloc error.
Fix hunt for dirty vs spilled pages: Don't leave x at a deleted pageno.
Cleanup: Factor out variables, squash pages already marked for deletion.

10 years agoITS#7515 Fix mt_dirty_room in nested txns.
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
ITS#7515 Fix mt_dirty_room in nested txns.

Fix description & code: Also ignore dirty pages hidden by
spilled pages, as they won't merge into our dirty_list.
Update it in mdb_page_flush() instead of mdb_page_spill().

10 years agoITS#7515 mdb_pages_xkeep(): Careful about xcursors.
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
ITS#7515 mdb_pages_xkeep(): Careful about xcursors.

Don't prod sub-pages or pages referring to uninitialized xcursors.

10 years agomdb_pages_xkeep(): Reformat, use common flag mask
Hallvard Furuseth [Mon, 23 Sep 2013 18:13:27 +0000 (20:13 +0200)]
mdb_pages_xkeep(): Reformat, use common flag mask

10 years agoUpdate MDB documentation and comments.
Hallvard Furuseth [Mon, 23 Sep 2013 18:09:47 +0000 (20:09 +0200)]
Update MDB documentation and comments.

10 years agoITS#7682 mdb_env_copy(): Avoid Linux O_DIRECT bug.
Hallvard Furuseth [Mon, 23 Sep 2013 18:07:29 +0000 (20:07 +0200)]
ITS#7682 mdb_env_copy(): Avoid Linux O_DIRECT bug.

Use fcntl() to set the flag.  Linux open(,O_DIRECT...) can create
the file even on failure, if the filesystem lacks O_DIRECT support.

10 years agoITS#7681 fix 18a07eb7c2dc33372455a6040984cd6b699b41a5
Howard Chu [Sun, 15 Sep 2013 20:08:29 +0000 (13:08 -0700)]
ITS#7681 fix 18a07eb7c2dc33372455a6040984cd6b699b41a5

Set rc=0 when taking the SET_RANGE branch

10 years agoITS#7701 fix mdb_rebalance
Howard Chu [Sat, 21 Sep 2013 21:37:11 +0000 (14:37 -0700)]
ITS#7701 fix mdb_rebalance

Must copy tmp cursor back to real cursor when merging into tmp cursor.

10 years agoFix mdb missing from list of backends
Quanah Gibson-Mount [Thu, 19 Sep 2013 21:31:25 +0000 (14:31 -0700)]
Fix mdb missing from list of backends

10 years agoITS#7687
Quanah Gibson-Mount [Thu, 19 Sep 2013 18:23:02 +0000 (11:23 -0700)]
ITS#7687

10 years agoITS#7687: password modify can muck with controls (quick fix)
Pierangelo Masarati [Tue, 10 Sep 2013 19:58:28 +0000 (21:58 +0200)]
ITS#7687: password modify can muck with controls (quick fix)

10 years agoITS#7685
Quanah Gibson-Mount [Thu, 19 Sep 2013 18:19:55 +0000 (11:19 -0700)]
ITS#7685

10 years agoITS#7685 add missing olcTLSProtocolMin
Howard Chu [Sat, 7 Sep 2013 17:00:11 +0000 (10:00 -0700)]
ITS#7685 add missing olcTLSProtocolMin

10 years agoITS#7381, ITS#7434
Quanah Gibson-Mount [Mon, 9 Sep 2013 16:23:14 +0000 (09:23 -0700)]
ITS#7381, ITS#7434

10 years agoITS#7381 more for prev commit
Howard Chu [Mon, 9 Sep 2013 11:59:20 +0000 (04:59 -0700)]
ITS#7381 more for prev commit

10 years agoITS#7381 fix chain config for restarts
Howard Chu [Fri, 6 Sep 2013 19:52:28 +0000 (12:52 -0700)]
ITS#7381 fix chain config for restarts

10 years agoITS#7680
Quanah Gibson-Mount [Mon, 9 Sep 2013 16:20:11 +0000 (09:20 -0700)]
ITS#7680

10 years agoITS#7680 Fix typos in manpages.
Jan Synacek [Tue, 3 Sep 2013 12:09:37 +0000 (14:09 +0200)]
ITS#7680 Fix typos in manpages.

10 years agoIn mdb_checkpoint, force sync
Howard Chu [Mon, 2 Sep 2013 19:54:48 +0000 (12:54 -0700)]
In mdb_checkpoint, force sync

Otherwise this is a no-op in various NOSYNC/MAPASYNC situations

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 9 Sep 2013 15:51:56 +0000 (08:51 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoRelease 0.9.8
Howard Chu [Mon, 9 Sep 2013 15:29:46 +0000 (08:29 -0700)]
Release 0.9.8

10 years agoReturn to engineering
Quanah Gibson-Mount [Sun, 8 Sep 2013 21:24:50 +0000 (14:24 -0700)]
Return to engineering

10 years agoupdates
Howard Chu [Thu, 5 Sep 2013 23:23:49 +0000 (16:23 -0700)]
updates

10 years agoITS#7682 In mdb_env_copy retry open if O_DIRECT fails
Salvador Ortiz [Thu, 5 Sep 2013 22:36:52 +0000 (17:36 -0500)]
ITS#7682 In mdb_env_copy retry open if O_DIRECT fails

10 years agoMore for 5f6fa8c04204888c4ff7ac6be1868d81ff4410a8
Howard Chu [Thu, 5 Sep 2013 13:02:07 +0000 (06:02 -0700)]
More for 5f6fa8c04204888c4ff7ac6be1868d81ff4410a8

Reset delete flag in cursor_put().

10 years agoITS#7681 fix mdb_cursor_set behaviour for MDB_SET_RANGE
Claude Brisson [Thu, 5 Sep 2013 10:58:18 +0000 (12:58 +0200)]
ITS#7681 fix mdb_cursor_set behaviour for MDB_SET_RANGE

10 years agoRemember if last cursor op was a delete
Howard Chu [Tue, 3 Sep 2013 23:10:20 +0000 (16:10 -0700)]
Remember if last cursor op was a delete

If so, don't advance cursor on next NEXT. Also, init xcursor
on the next GET_CURRENT.

10 years agoAdd a changelog
Howard Chu [Thu, 29 Aug 2013 03:22:41 +0000 (20:22 -0700)]
Add a changelog

10 years agoBump version to 0.9.8
Howard Chu [Thu, 29 Aug 2013 02:17:25 +0000 (19:17 -0700)]
Bump version to 0.9.8

10 years agoAllow mdb_env_set_mapsize() on an open environment
Howard Chu [Thu, 29 Aug 2013 02:12:59 +0000 (19:12 -0700)]
Allow mdb_env_set_mapsize() on an open environment

The caller is responsible for making sure no transactions are
active in this process before resizing. This is slightly lighter
weight than doing a full env_close/env_open cycle.

10 years agoITS#7672 fix mdb_dbi_flags
Howard Chu [Tue, 27 Aug 2013 13:28:30 +0000 (06:28 -0700)]
ITS#7672 fix mdb_dbi_flags

Use a txn instead of env argument. Only return persistent flags.

10 years agomdb_page_unspill(): Fix dirty_room in nested txn
Hallvard Furuseth [Sun, 25 Aug 2013 21:59:58 +0000 (23:59 +0200)]
mdb_page_unspill(): Fix dirty_room in nested txn

10 years agoAnother take on spill_pgs and deletes
Howard Chu [Sat, 24 Aug 2013 19:37:45 +0000 (20:37 +0100)]
Another take on spill_pgs and deletes

10 years agoCleanup prev commit
Howard Chu [Sat, 24 Aug 2013 18:54:05 +0000 (11:54 -0700)]
Cleanup prev commit

10 years agoSpeedup deletion from spill_pgs
Howard Chu [Sat, 24 Aug 2013 18:48:37 +0000 (19:48 +0100)]
Speedup deletion from spill_pgs

10 years agoITS#7671 always return the key for a dup val
Howard Chu [Fri, 23 Aug 2013 14:36:07 +0000 (07:36 -0700)]
ITS#7671 always return the key for a dup val

10 years agoITS#7670 Tweak cursor_del0
Howard Chu [Fri, 23 Aug 2013 04:43:29 +0000 (21:43 -0700)]
ITS#7670 Tweak cursor_del0

Always leave cursor pointing at "next" node, if any.
Find next sibling if we're already at end of current page.

10 years agomdb_page_spill(): Fix nested txn mt_dirty_room
Hallvard Furuseth [Fri, 23 Aug 2013 05:39:04 +0000 (07:39 +0200)]
mdb_page_spill(): Fix nested txn mt_dirty_room

10 years agoSimplify last commits
Hallvard Furuseth [Fri, 23 Aug 2013 05:37:17 +0000 (07:37 +0200)]
Simplify last commits

10 years agoTweak prev commit
Howard Chu [Fri, 23 Aug 2013 04:29:53 +0000 (21:29 -0700)]
Tweak prev commit

If somehow "need" is larger than the list size, don't
try to fake out the dirty list.

10 years agoLess aggressive page_spill
Howard Chu [Fri, 23 Aug 2013 01:51:48 +0000 (18:51 -0700)]
Less aggressive page_spill

spilling all possible pages is a waste because the majority will be
needed again. Just do 1/8th of the dirty list instead.

10 years agoUpdate caveats now that mdb_reader_check exists
Howard Chu [Wed, 21 Aug 2013 00:37:53 +0000 (17:37 -0700)]
Update caveats now that mdb_reader_check exists

10 years agoolcListenerThreads should be available in globalconfig
Quanah Gibson-Mount [Mon, 19 Aug 2013 22:37:10 +0000 (15:37 -0700)]
olcListenerThreads should be available in globalconfig

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 OPENLDAP_REL_ENG_2_4_36
Quanah Gibson-Mount [Fri, 16 Aug 2013 18:12:59 +0000 (11:12 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoSilence warnings
Howard Chu [Wed, 14 Aug 2013 16:57:25 +0000 (09:57 -0700)]
Silence warnings

10 years agoTweak ITS#7615 fix: Obey strict-aliasing rules.
Hallvard Furuseth [Wed, 14 Aug 2013 13:21:59 +0000 (15:21 +0200)]
Tweak ITS#7615 fix: Obey strict-aliasing rules.

Do not access a long long as an array of longs.

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 13 Aug 2013 20:36:40 +0000 (13:36 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7664 better fix
Howard Chu [Tue, 13 Aug 2013 20:12:47 +0000 (13:12 -0700)]
ITS#7664 better fix

For RDONLY, don't get lockfile until we know datafile exists.
Also, don't try to create a new datafile for me_mfd if someone
deleted it after we got me_fd.

10 years agoRevert "ITS#7664 delete lockfile if there is no environment"
Howard Chu [Tue, 13 Aug 2013 20:05:32 +0000 (13:05 -0700)]
Revert "ITS#7664 delete lockfile if there is no environment"

This reverts commit 8725838409512e999d78ea7b60773ce2f94d588f.

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 13 Aug 2013 18:50:24 +0000 (11:50 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4