]> git.sur5r.net Git - openldap/log
openldap
10 years agoFix libldap deref control call
Quanah Gibson-Mount [Wed, 8 Jan 2014 00:05:03 +0000 (18:05 -0600)]
Fix libldap deref control call

10 years agofix years old cut'n'paste
Pierangelo Masarati [Sat, 28 Dec 2013 10:03:55 +0000 (11:03 +0100)]
fix years old cut'n'paste

10 years agoITS#7762
Quanah Gibson-Mount [Tue, 7 Jan 2014 23:55:20 +0000 (17:55 -0600)]
ITS#7762

10 years agoITS#7762 shortcut NULL RDNs
Howard Chu [Wed, 11 Dec 2013 12:41:48 +0000 (04:41 -0800)]
ITS#7762 shortcut NULL RDNs

10 years agoITS#7761
Quanah Gibson-Mount [Tue, 7 Jan 2014 23:53:08 +0000 (17:53 -0600)]
ITS#7761

10 years agoITS#7761 bail out of search if config is pausing
Howard Chu [Wed, 11 Dec 2013 02:08:36 +0000 (18:08 -0800)]
ITS#7761 bail out of search if config is pausing

10 years agoITS#7753
Quanah Gibson-Mount [Tue, 7 Jan 2014 23:49:11 +0000 (17:49 -0600)]
ITS#7753

10 years agoITS#7753 use $(MAKE) for tests
Howard Chu [Mon, 9 Dec 2013 09:30:30 +0000 (01:30 -0800)]
ITS#7753 use $(MAKE) for tests

10 years agoITS#7759
Quanah Gibson-Mount [Tue, 7 Jan 2014 23:47:45 +0000 (17:47 -0600)]
ITS#7759

10 years agoITS#7759 avoid assert in parse_passwdpolicy_control
Howard Chu [Sat, 7 Dec 2013 16:36:14 +0000 (08:36 -0800)]
ITS#7759 avoid assert in parse_passwdpolicy_control

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 7 Jan 2014 23:44:34 +0000 (17:44 -0600)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7775 Drop <assert.h>, drop/replace assert()s.
Hallvard Furuseth [Mon, 6 Jan 2014 22:21:54 +0000 (23:21 +0100)]
ITS#7775 Drop <assert.h>, drop/replace assert()s.

db_mid2l_insert(): Move assert to mdb.c.
mdb_cursor_set(): Previous assert cannot fail now.
mdb_cursor_put(): Check mc/key and return EINVAL.
mdb_cursor_dbi(): No error return, so just segfault if cursor==NULL.

10 years agoITS#7775 Cleanup mdb_node_del()
Howard Chu [Mon, 6 Jan 2014 22:21:44 +0000 (23:21 +0100)]
ITS#7775 Cleanup mdb_node_del()

10 years agoITS#7775 Add mdb_env_set_assert()
Hallvard Furuseth [Mon, 6 Jan 2014 22:17:38 +0000 (23:17 +0100)]
ITS#7775 Add mdb_env_set_assert()

10 years agoAdd mdb_env_<set,get>_userctx()
Hallvard Furuseth [Mon, 6 Jan 2014 22:17:38 +0000 (23:17 +0100)]
Add mdb_env_<set,get>_userctx()

10 years agoITS#7377 Invalidate txn on page-allocation errors
Hallvard Furuseth [Mon, 6 Jan 2014 22:17:37 +0000 (23:17 +0100)]
ITS#7377 Invalidate txn on page-allocation errors

This should likely be reverted when all callers handle these errors.

10 years agoWrap __func__ in mdb_func_
Hallvard Furuseth [Sun, 5 Jan 2014 15:37:26 +0000 (16:37 +0100)]
Wrap __func__ in mdb_func_

10 years agoInvalidate the txn on corruption/internal errors
Hallvard Furuseth [Sun, 5 Jan 2014 15:26:21 +0000 (16:26 +0100)]
Invalidate the txn on corruption/internal errors

10 years agoITS#7775 cleanup unnecessary assert()s
Howard Chu [Fri, 3 Jan 2014 20:40:28 +0000 (12:40 -0800)]
ITS#7775 cleanup unnecessary assert()s

10 years agomdb_page_malloc(): Move VGMEMP_ALLOC before memset
Hallvard Furuseth [Tue, 31 Dec 2013 01:16:19 +0000 (02:16 +0100)]
mdb_page_malloc(): Move VGMEMP_ALLOC before memset

10 years agoITS#7771 mdb_cursor_del0(): Fix xcursor tracking.
Hallvard Furuseth [Sun, 29 Dec 2013 14:58:21 +0000 (15:58 +0100)]
ITS#7771 mdb_cursor_del0(): Fix xcursor tracking.

10 years agosprintf format: pid_t need not be an int.
Hallvard Furuseth [Sun, 29 Dec 2013 14:57:33 +0000 (15:57 +0100)]
sprintf format: pid_t need not be an int.

10 years agoAdd mdb_dbg_pgno(): (sub)pagenum for debug output.
Hallvard Furuseth [Sun, 29 Dec 2013 14:09:51 +0000 (15:09 +0100)]
Add mdb_dbg_pgno(): (sub)pagenum for debug output.

10 years agoITS#7772 Reduce spurious sub-page growth.
Hallvard Furuseth [Sun, 29 Dec 2013 14:09:05 +0000 (15:09 +0100)]
ITS#7772 Reduce spurious sub-page growth.

mdb_cursor_put(): Use free sub-page space added by a
previous put(existing DUPSORT item), if any.
Tweak NUMKEYS code to avoid a new signedness warning.

10 years agoITS#7665 Drop lmdb.h doc on non-overlapping flags.
Hallvard Furuseth [Sun, 29 Dec 2013 13:54:17 +0000 (14:54 +0100)]
ITS#7665 Drop lmdb.h doc on non-overlapping flags.

It was inaccurate and misplaced. Verify it in mdb.c instead.

10 years agoITS#7515 has been fixed.
Hallvard Furuseth [Sun, 29 Dec 2013 13:52:30 +0000 (14:52 +0100)]
ITS#7515 has been fixed.

10 years agoDrop UNLOCK_MUTEX_R() on mdb_reader_pid() error
Hallvard Furuseth [Sun, 29 Dec 2013 13:52:30 +0000 (14:52 +0100)]
Drop UNLOCK_MUTEX_R() on mdb_reader_pid() error

10 years agoFix commit "Raise safe max MDB_MAXKEYSIZE."
Hallvard Furuseth [Sat, 21 Dec 2013 11:31:57 +0000 (12:31 +0100)]
Fix commit "Raise safe max MDB_MAXKEYSIZE."

I.e. d69d2ce2307e9d0e2167843935c386b05a869c31, it left out some changes.

10 years agoReplace MDB_node.mn_offset[], to ease debugging.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:13 +0000 (11:57 +0100)]
Replace MDB_node.mn_offset[], to ease debugging.

10 years agoComment MDB_node, mdb_page_unspill, mdb_update_key
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:13 +0000 (11:57 +0100)]
Comment MDB_node, mdb_page_unspill, mdb_update_key

10 years agoFix mdb_reader_list() and its spec.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:13 +0000 (11:57 +0100)]
Fix mdb_reader_list() and its spec.

It and the MDB_msg_func can now return >= 0 for success.
Always return any MDB_msg_func() error result.

10 years agoSupport dynamic max MDB keysize.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:13 +0000 (11:57 +0100)]
Support dynamic max MDB keysize.

10 years agoRaise safe max MDB_MAXKEYSIZE.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:13 +0000 (11:57 +0100)]
Raise safe max MDB_MAXKEYSIZE.

Use a sub-DB for DUPSORT item #1/#2 per key if needed: Not a sub-
page too big for a node, nor an overflow page (which not all DUPSORT
code checks for). Move "insert" code, to avoid non-loop goto upwards.

(This is the commit which needs the change to xdata.mv_size in
commit 9d6e4a916367e85ffdf37b1cb7b5cdb7ac0e15b5 "page sizes".)

10 years agoRelax MDB_MAXKEYSIZE for existing data.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
Relax MDB_MAXKEYSIZE for existing data.

Handle keys stored by a liblmdb with a bigger MDB_MAXKEYSIZE.
mdb_get/mdb_del(absent key bigger than our MDB_MAXKEYSIZE)
now return MDB_NOTFOUND instead of MDB_BAD_VALSIZE.

10 years agoITS#7589 Fix me_nodemax and related node sizes.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
ITS#7589 Fix me_nodemax and related node sizes.

Change me_nodemax to not count the mp_ptrs[] entry. That's mostly
how it was used. Compare node sizes ">" me_nodemax instead of ">=".
The ">=" was a workaround for confusing sizes with and without the
mp_ptrs[] entry, but broke for nodes with size (old me_nodemax-1).

Explicitly make me_nodemax even. An odd value could break the
comparisons. It was even anyway because MDB_MINKEYS == 2.

10 years agoITS#7589 Fix delete(uneven-sized MDB_DUPFIXED data).
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
ITS#7589 Fix delete(uneven-sized MDB_DUPFIXED data).

Do not give uneven sizes to the sub-page and the node it lives in.

10 years agoput(MDB_MULTIPLE): Skip existing item cleanly.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
put(MDB_MULTIPLE): Skip existing item cleanly.

Don't set dkey.mv_size if mdb won't clear it before next iteration.

10 years agoAdd EVEN(): Micro-optimize "up to multiple of 2".
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
Add EVEN(): Micro-optimize "up to multiple of 2".

10 years agoWarning cleanup.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
Warning cleanup.

Drop unused computed/assigned values.
mdb_page_alloc(): Make "mop_len>0 implies mop!=NULL" provable.

10 years agoClean up mdb_copy.
Hallvard Furuseth [Wed, 11 Dec 2013 10:57:12 +0000 (11:57 +0100)]
Clean up mdb_copy.

Support MDB_NOSUBDIR. Catch more errors.  Write messages
to stderr, not stdout which the data too may be piped to.

10 years agoFix GET_BOTH_RANGE
Howard Chu [Thu, 5 Dec 2013 02:42:49 +0000 (18:42 -0800)]
Fix GET_BOTH_RANGE

On near match, return the matched data.

10 years agoITS#7757
Quanah Gibson-Mount [Wed, 4 Dec 2013 18:37:45 +0000 (10:37 -0800)]
ITS#7757

10 years agoITS#7757 plug memleak
Howard Chu [Tue, 3 Dec 2013 22:16:20 +0000 (14:16 -0800)]
ITS#7757 plug memleak

10 years agoITS#7756
Quanah Gibson-Mount [Mon, 2 Dec 2013 17:51:20 +0000 (09:51 -0800)]
ITS#7756

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 2 Dec 2013 17:50:50 +0000 (09:50 -0800)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7756 keysizes were wrong in mdb_update_key
Howard Chu [Sat, 30 Nov 2013 01:03:49 +0000 (17:03 -0800)]
ITS#7756 keysizes were wrong in mdb_update_key

10 years agoMore for ITS#7749
Quanah Gibson-Mount [Fri, 22 Nov 2013 15:39:43 +0000 (07:39 -0800)]
More for ITS#7749

10 years agoITS#7749 more for prev commit
Howard Chu [Thu, 21 Nov 2013 19:18:24 +0000 (11:18 -0800)]
ITS#7749 more for prev commit

10 years agoITS#7750
Quanah Gibson-Mount [Tue, 19 Nov 2013 15:26:10 +0000 (07:26 -0800)]
ITS#7750

10 years agoITS#7750 fix olcDbConfig modification
Howard Chu [Tue, 19 Nov 2013 04:39:35 +0000 (20:39 -0800)]
ITS#7750 fix olcDbConfig modification

10 years agoReturn to release engineering
Quanah Gibson-Mount [Tue, 19 Nov 2013 15:24:55 +0000 (07:24 -0800)]
Return to release engineering

10 years agoITS#7749 OPENLDAP_REL_ENG_2_4_38
Quanah Gibson-Mount [Fri, 15 Nov 2013 03:31:27 +0000 (19:31 -0800)]
ITS#7749

10 years agoITS#7749 propagate op->o_extra in syncprov_findbase
Howard Chu [Fri, 15 Nov 2013 03:16:57 +0000 (19:16 -0800)]
ITS#7749 propagate op->o_extra in syncprov_findbase

10 years agoPrep for release
Quanah Gibson-Mount [Thu, 14 Nov 2013 19:13:55 +0000 (11:13 -0800)]
Prep for release

10 years agoITS#7746
Quanah Gibson-Mount [Thu, 14 Nov 2013 16:42:47 +0000 (08:42 -0800)]
ITS#7746

10 years agoITS#7746 fix for cert with NULL issuerDN
Howard Chu [Thu, 14 Nov 2013 11:02:07 +0000 (03:02 -0800)]
ITS#7746 fix for cert with NULL issuerDN

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 12 Nov 2013 17:07:50 +0000 (09:07 -0800)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7743 bits
Quanah Gibson-Mount [Tue, 12 Nov 2013 17:06:24 +0000 (09:06 -0800)]
ITS#7743 bits

10 years agoITS#7743 Fix indexed AND filter
Howard Chu [Tue, 12 Nov 2013 05:01:33 +0000 (21:01 -0800)]
ITS#7743 Fix indexed AND filter

Partially revert 47f6aec61e65afd66bea096887f1cd550b55946e
Was using RANGE_FIRST/RANGE_LAST on an IDL known to *not* be a range.

10 years agoDoc tweak
Howard Chu [Tue, 12 Nov 2013 16:10:33 +0000 (08:10 -0800)]
Doc tweak

Measured perf cost of meminit was 7% worst case on an Intel Core2
system. YMMV.

10 years agoBump to 0.9.10
Howard Chu [Tue, 12 Nov 2013 04:15:54 +0000 (20:15 -0800)]
Bump to 0.9.10

10 years agoWindows/Win64/MSVC tweaks
Howard Chu [Tue, 12 Nov 2013 04:08:26 +0000 (20:08 -0800)]
Windows/Win64/MSVC tweaks

Silence warnings, fix broken MinGW64 definitions, etc.

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 12 Nov 2013 01:45:53 +0000 (17:45 -0800)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoClarify WRITEMAP / NOMEMINIT
Howard Chu [Tue, 12 Nov 2013 00:35:17 +0000 (16:35 -0800)]
Clarify WRITEMAP / NOMEMINIT

10 years agoChange default mem init behavior
Howard Chu [Mon, 11 Nov 2013 23:09:32 +0000 (15:09 -0800)]
Change default mem init behavior

Init malloc'd memory by default, use #MDB_NOMEMINIT to disable.
Bump version to 0.9.10

10 years agoAdd MDB_CLEANMEM option.
Hallvard Furuseth [Thu, 7 Nov 2013 22:41:30 +0000 (23:41 +0100)]
Add MDB_CLEANMEM option.

Initialize unused portions of DB pages, for security or to silence
checkers like Purify and Valgrind. Like BDB configure --enable-umrw.

10 years agoFix MDB_MAXKEYSIZE doc: Account for MDB_DUPSORT.
Hallvard Furuseth [Thu, 7 Nov 2013 22:38:15 +0000 (23:38 +0100)]
Fix MDB_MAXKEYSIZE doc: Account for MDB_DUPSORT.

A node may need room for [key, subpage with 2 items] = 3 keys.

10 years agoITS#7713 Handle bigger OS page sizes
Hallvard Furuseth [Thu, 7 Nov 2013 22:38:15 +0000 (23:38 +0100)]
ITS#7713 Handle bigger OS page sizes

Use DB page size = min(32k, OS pagesize).  Previous limit was 8k
(MDB_MINKEYS*MDB_PAGESIZE).

Handle DB pagesize < OS pagesize. That's an I/O pessimization,
but transactions remain atomic: Only writing the MDB_meta must
be atomic, and it fits in one OS page.

Don't truncate desired subpage size: Asssign it to a size_t
(mv_size), not an uint16_t (mp_upper).

10 years agomdb_cursor_put(): Factor out code. Kill a label.
Hallvard Furuseth [Thu, 7 Nov 2013 22:38:15 +0000 (23:38 +0100)]
mdb_cursor_put(): Factor out code. Kill a label.

10 years agoFix prev commit, cursor depth comparison
Howard Chu [Thu, 7 Nov 2013 17:37:48 +0000 (09:37 -0800)]
Fix prev commit, cursor depth comparison

10 years agoFix cursor_del0 cursor fixup
Howard Chu [Thu, 7 Nov 2013 00:49:25 +0000 (16:49 -0800)]
Fix cursor_del0 cursor fixup

Skip cursors that aren't as deep as current cursor

10 years agoITS#7741
Quanah Gibson-Mount [Wed, 6 Nov 2013 18:25:33 +0000 (10:25 -0800)]
ITS#7741

10 years agoITS#7741 Fix entryDN index lookup
Howard Chu [Wed, 6 Nov 2013 17:39:38 +0000 (09:39 -0800)]
ITS#7741 Fix entryDN index lookup

DN notfound is authoritative, don't ignore the result

10 years agoFix CONFIG_DELETE crash
Howard Chu [Tue, 5 Nov 2013 20:59:56 +0000 (12:59 -0800)]
Fix CONFIG_DELETE crash

Closing a connection can abandon its ops without going thru the threadpool,
so make sure to lock the si_ops_mutex before walking the list.

10 years agoITS#7735 fix memctx usage in prev commit
Howard Chu [Tue, 5 Nov 2013 19:49:43 +0000 (11:49 -0800)]
ITS#7735 fix memctx usage in prev commit

10 years agoMore for ITS#7589
Quanah Gibson-Mount [Tue, 5 Nov 2013 19:19:38 +0000 (11:19 -0800)]
More for ITS#7589

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Tue, 5 Nov 2013 19:18:47 +0000 (11:18 -0800)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7739
Quanah Gibson-Mount [Tue, 5 Nov 2013 19:18:35 +0000 (11:18 -0800)]
ITS#7739

10 years agoITS#7739 fix for empty nested include
Howard Chu [Tue, 5 Nov 2013 15:34:30 +0000 (07:34 -0800)]
ITS#7739 fix for empty nested include

10 years agoITS#7740
Quanah Gibson-Mount [Tue, 5 Nov 2013 19:18:05 +0000 (11:18 -0800)]
ITS#7740

10 years agoITS#7740 back-meta: avoid blocking other threads
Jorge Perez Burgos [Tue, 5 Nov 2013 09:12:41 +0000 (10:12 +0100)]
ITS#7740 back-meta: avoid blocking other threads

Don't lock other threads while trying to connect to remote node.

10 years agoITS#7735
Quanah Gibson-Mount [Tue, 5 Nov 2013 19:17:20 +0000 (11:17 -0800)]
ITS#7735

10 years agoFix slap_reparse_sync_cookie prototype
Howard Chu [Sat, 2 Nov 2013 21:20:15 +0000 (14:20 -0700)]
Fix slap_reparse_sync_cookie prototype

10 years agoITS#7735 plug memleak
Howard Chu [Fri, 1 Nov 2013 18:07:51 +0000 (11:07 -0700)]
ITS#7735 plug memleak

Introduced in commit 48cdd54d9accb9283807ed592369b72654fb302d

10 years agoMore for #7589
Howard Chu [Tue, 5 Nov 2013 04:00:55 +0000 (20:00 -0800)]
More for #7589

10 years agoITS#7737
Quanah Gibson-Mount [Fri, 1 Nov 2013 17:00:31 +0000 (10:00 -0700)]
ITS#7737

10 years agoITS#7737 Add a matching rule for OlcDbEnvFlgs
Quanah Gibson-Mount [Fri, 1 Nov 2013 16:57:20 +0000 (09:57 -0700)]
ITS#7737 Add a matching rule for OlcDbEnvFlgs

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Fri, 1 Nov 2013 00:55:06 +0000 (17:55 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoITS#7589 another mdb_page_split fix
Howard Chu [Fri, 1 Nov 2013 00:31:15 +0000 (17:31 -0700)]
ITS#7589 another mdb_page_split fix

Tweak split_indx check, go one slot further.

10 years agoITS#7736 fix regression in ITS#7733 patch
Howard Chu [Thu, 31 Oct 2013 23:01:04 +0000 (16:01 -0700)]
ITS#7736 fix regression in ITS#7733 patch

In d8eccb353b1be7f07e74149dde9a41bb199d74e8

10 years agoITS#7736 fix regression in ITS#7733 patch
Howard Chu [Thu, 31 Oct 2013 23:01:04 +0000 (16:01 -0700)]
ITS#7736 fix regression in ITS#7733 patch

In d8eccb353b1be7f07e74149dde9a41bb199d74e8

10 years agoReturn to RE
Quanah Gibson-Mount [Thu, 31 Oct 2013 21:53:42 +0000 (14:53 -0700)]
Return to RE

10 years agoITS#7662
Quanah Gibson-Mount [Thu, 31 Oct 2013 21:53:18 +0000 (14:53 -0700)]
ITS#7662

10 years agoITS#7662 cleanup reader txn in mdb_entry_get()
Howard Chu [Sat, 10 Aug 2013 12:05:16 +0000 (05:05 -0700)]
ITS#7662 cleanup reader txn in mdb_entry_get()

10 years agoITS#7733, ITS#7734
Quanah Gibson-Mount [Mon, 28 Oct 2013 16:26:23 +0000 (09:26 -0700)]
ITS#7733, ITS#7734

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

10 years agoITS#7733 check cursor index before cursor_del
Howard Chu [Mon, 28 Oct 2013 14:25:54 +0000 (07:25 -0700)]
ITS#7733 check cursor index before cursor_del

10 years agoITS#7734 Add MDB_NORDAHEAD to CHANGELESS.
David Wilson [Mon, 28 Oct 2013 13:58:04 +0000 (06:58 -0700)]
ITS#7734 Add MDB_NORDAHEAD to CHANGELESS.

10 years agoPrep for release OPENLDAP_REL_ENG_2_4_37
Quanah Gibson-Mount [Sat, 26 Oct 2013 20:46:04 +0000 (13:46 -0700)]
Prep for release

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Thu, 24 Oct 2013 23:25:17 +0000 (16:25 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4