]> git.sur5r.net Git - openldap/log
openldap
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

10 years agoITS#7664 delete lockfile if there is no environment
Howard Chu [Tue, 13 Aug 2013 18:34:32 +0000 (11:34 -0700)]
ITS#7664 delete lockfile if there is no environment

10 years agoPrep for release
Quanah Gibson-Mount [Tue, 13 Aug 2013 00:57:45 +0000 (17:57 -0700)]
Prep for release

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

10 years agoFix uninit'd mem ref in mdb_page_split
Howard Chu [Mon, 12 Aug 2013 19:43:42 +0000 (12:43 -0700)]
Fix uninit'd mem ref in mdb_page_split

Don't compare cursors beyond their depth. (detected by valgrind)

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

10 years agoTweak NODUPDATA flag check
Howard Chu [Mon, 12 Aug 2013 00:25:00 +0000 (17:25 -0700)]
Tweak NODUPDATA flag check

Should allow for the possibility of future flag combos.

10 years agoFix obscure MDB_MULTIPLE bug
Howard Chu [Mon, 12 Aug 2013 00:15:03 +0000 (17:15 -0700)]
Fix obscure MDB_MULTIPLE bug

If a key has a single existing value, and then a put (MDB_MULTIPLE)
is done where the first of the multiple values matches the existing
value, the put would return SUCCESS without writing any of the
values. Fixed to loop to the next value as intended.

10 years agoITS#7660
Quanah Gibson-Mount [Sun, 11 Aug 2013 22:34:42 +0000 (15:34 -0700)]
ITS#7660

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Sun, 11 Aug 2013 22:34:00 +0000 (15:34 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoPoint to mdb.c for docs on macros in Makefile
Howard Chu [Sat, 10 Aug 2013 21:55:51 +0000 (14:55 -0700)]
Point to mdb.c for docs on macros in Makefile

10 years agoAvoid compiling debug args with C90 compilers.
Hallvard Furuseth [Sat, 10 Aug 2013 11:50:10 +0000 (13:50 +0200)]
Avoid compiling debug args with C90 compilers.

Use double DPRINTF() parenthesis, so varargs macros are not needed.
Parenthesize MDB_DEBUG, in case the user defines it as foo || bar.

10 years agoRefuse ops on bad txns
Hallvard Furuseth [Sat, 10 Aug 2013 11:23:30 +0000 (13:23 +0200)]
Refuse ops on bad txns

10 years agoReplace EINVALs with generalized MDB_INCOMPATIBLE.
Hallvard Furuseth [Sat, 10 Aug 2013 11:23:30 +0000 (13:23 +0200)]
Replace EINVALs with generalized MDB_INCOMPATIBLE.

Also check xcursor instead of DUPSORT, it's slightly briefer.

10 years agoITS#7656 fix install target
John Hewson [Sat, 10 Aug 2013 11:12:42 +0000 (04:12 -0700)]
ITS#7656 fix install target

10 years agoITS#7660 Add mdb_txn_env to API
Salvador Ortiz [Fri, 9 Aug 2013 16:03:28 +0000 (11:03 -0500)]
ITS#7660 Add mdb_txn_env to API

10 years agomdb_txn_commit(): Always commit if MDB_TXN_SPILLS.
Hallvard Furuseth [Sat, 10 Aug 2013 10:29:45 +0000 (12:29 +0200)]
mdb_txn_commit(): Always commit if MDB_TXN_SPILLS.

Checking dirty_list was insufficient after a spill
with no named databases and no positioned cursors.

10 years agoITS#7661 mdb_dbi_flags(): Allow main DBI
Salvador Ortiz [Sat, 10 Aug 2013 07:42:19 +0000 (09:42 +0200)]
ITS#7661 mdb_dbi_flags(): Allow main DBI

10 years agoITS#7659
Quanah Gibson-Mount [Fri, 9 Aug 2013 22:59:20 +0000 (15:59 -0700)]
ITS#7659

10 years agoITS#7659 add directoryString compatible syntaxes
Howard Chu [Fri, 9 Aug 2013 17:08:09 +0000 (10:08 -0700)]
ITS#7659 add directoryString compatible syntaxes

countryString and telephoneNumber were missing

10 years agoITS#7658
Quanah Gibson-Mount [Fri, 9 Aug 2013 16:38:14 +0000 (09:38 -0700)]
ITS#7658

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

10 years agomdb_del must ignore data if db not opened with MDB_DUPSORT
Salvador Ortiz [Fri, 9 Aug 2013 15:08:53 +0000 (10:08 -0500)]
mdb_del must ignore data if db not opened with MDB_DUPSORT

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

10 years agoAdd mdb_env_get_maxkeysize()
Howard Chu [Fri, 9 Aug 2013 11:51:33 +0000 (04:51 -0700)]
Add mdb_env_get_maxkeysize()

10 years agoReplace unpredictable EINVAL error returns.
Hallvard Furuseth [Fri, 9 Aug 2013 11:05:14 +0000 (13:05 +0200)]
Replace unpredictable EINVAL error returns.

Return EINVAL only for simple programmer errors.

10 years agoRe-fix reader-pid code
Hallvard Furuseth [Fri, 9 Aug 2013 10:54:42 +0000 (12:54 +0200)]
Re-fix reader-pid code

10 years agomdb_cursorpages_mark: Mark current txn and no more.
Hallvard Furuseth [Thu, 8 Aug 2013 17:57:52 +0000 (19:57 +0200)]
mdb_cursorpages_mark: Mark current txn and no more.

Ignore parent txn cursors since it is the current txn's dirty_list
which will be flushed. But check the current txn also when clearing,
since cursors can have pages which are dirty in a parent.

Check !mc_xcursor instead of !MDB_DUPSORT.  Equivalent for valid
data, but a bit safer if the sub-DB flags are corrupt.

10 years agoFix mdb_ovpage_free() vs. spill.
Hallvard Furuseth [Thu, 8 Aug 2013 17:57:52 +0000 (19:57 +0200)]
Fix mdb_ovpage_free() vs. spill.

Ensure me_pghead has room before removing from spill/dirty list.
Don't return pages to me_pghead in nested txns, use mt_free_pgs.

10 years agoFix page spilling when MDB_WRITEMAP.
Hallvard Furuseth [Thu, 8 Aug 2013 17:57:51 +0000 (19:57 +0200)]
Fix page spilling when MDB_WRITEMAP.

mdb_page_spill(): Don't binary-search the unsorted dirty_list.
mdb_page_flush(): Don't overwrite unprocessed dirty_list items.

10 years agoSet MDB_TXN_ERROR when inconsistent txn state
Hallvard Furuseth [Thu, 8 Aug 2013 17:57:51 +0000 (19:57 +0200)]
Set MDB_TXN_ERROR when inconsistent txn state

10 years agoFactor out MDB_env.
Hallvard Furuseth [Thu, 8 Aug 2013 17:54:54 +0000 (19:54 +0200)]
Factor out MDB_env.

10 years agoMDB_LOCK_VERSION -> MDB_LOCK_FORMAT.
Hallvard Furuseth [Thu, 8 Aug 2013 17:43:04 +0000 (19:43 +0200)]
MDB_LOCK_VERSION -> MDB_LOCK_FORMAT.

Pid locking needs a different lockfile-version: MDB_env's with and
without pid locking must not coexist, they can sabotage each other.
Store MDB_LOCK_FORMAT = (version | "use locking" flag) instead.

10 years agoFix mdb_reader_pid().
Hallvard Furuseth [Thu, 8 Aug 2013 17:43:04 +0000 (19:43 +0200)]
Fix mdb_reader_pid().

Treat unexpected errors as "don't know".  Invert Pidcheck return
value, so nonzero including error codes = "the process may exist".

On Windows: Catch exited but still existing processes.  Handle
undefined PROCESS_QUERY_LIMITED_INFORMATION.
On Unix: don't trust F_GETLK error to leave the input alone,
the fcntl() doc seems unclear.

10 years agoUse proper printf format on Windows
Howard Chu [Wed, 7 Aug 2013 19:42:46 +0000 (12:42 -0700)]
Use proper printf format on Windows

10 years agoITS#7645 more for TLSProtocolMin
Howard Chu [Wed, 7 Aug 2013 18:08:09 +0000 (11:08 -0700)]
ITS#7645 more for TLSProtocolMin

10 years agoSilence warnings
Hallvard Furuseth [Mon, 5 Aug 2013 08:01:39 +0000 (10:01 +0200)]
Silence warnings

10 years agoTweak comments
Hallvard Furuseth [Mon, 5 Aug 2013 07:55:57 +0000 (09:55 +0200)]
Tweak comments

10 years agoClarify doc: mdb_copy, nested txns, mdb_drop().
Hallvard Furuseth [Mon, 5 Aug 2013 07:55:48 +0000 (09:55 +0200)]
Clarify doc: mdb_copy, nested txns, mdb_drop().

mdb_copy: Does not copy lockfile. Can trigger file growth.
mdb_txn_begin(): Clarify usage restrictions.
mdb_drop(): State what to do rather than what will be done, since
closing the handle could otherwise be read as happening even at failure.

10 years agoITS#7591
Quanah Gibson-Mount [Fri, 2 Aug 2013 21:17:08 +0000 (14:17 -0700)]
ITS#7591

10 years agoITS#7591 fix back-meta missing result msgs
Howard Chu [Fri, 2 Aug 2013 11:44:57 +0000 (04:44 -0700)]
ITS#7591 fix back-meta missing result msgs

10 years agoITS#7654
Quanah Gibson-Mount [Fri, 2 Aug 2013 21:16:39 +0000 (14:16 -0700)]
ITS#7654

10 years agoITS#7654 fix implicit declaration warnings
Howard Chu [Fri, 2 Aug 2013 11:03:05 +0000 (04:03 -0700)]
ITS#7654 fix implicit declaration warnings

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Wed, 31 Jul 2013 17:13:12 +0000 (10:13 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoTweak prev commit again
Howard Chu [Wed, 31 Jul 2013 15:09:40 +0000 (08:09 -0700)]
Tweak prev commit again

Make sure errors are propagated from init_meta

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

10 years agoFix typo in Win32 branch
Howard Chu [Tue, 30 Jul 2013 20:44:28 +0000 (13:44 -0700)]
Fix typo in Win32 branch

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

10 years agoCleanup prev commit
Howard Chu [Tue, 30 Jul 2013 19:47:12 +0000 (12:47 -0700)]
Cleanup prev commit

Loop on copyfd meta write, since pipes may return after partial write.

10 years agoITS#7652 fix I/O error checks
Howard Chu [Tue, 30 Jul 2013 17:22:12 +0000 (10:22 -0700)]
ITS#7652 fix I/O error checks

partial revert of d6d2638acc245116b8f091ac425b6700d06c4713 and
26a25df5fcc2fcddae6597a61c1b867fc27c568b

The original code was already tested and working correctly.

10 years agoITS#5655,ITS#7645
Quanah Gibson-Mount [Mon, 29 Jul 2013 19:38:08 +0000 (12:38 -0700)]
ITS#5655,ITS#7645

10 years agoITS#7645 use ldap_pvt_tls_config for TLSProtocolMin
Howard Chu [Mon, 29 Jul 2013 14:04:03 +0000 (07:04 -0700)]
ITS#7645 use ldap_pvt_tls_config for TLSProtocolMin

10 years agoITS#7645 more OpenSSL TLS versions
Philip Guenther [Mon, 29 Jul 2013 14:01:15 +0000 (07:01 -0700)]
ITS#7645 more OpenSSL TLS versions

10 years agoITS#7645, #5655 TLSProtocolMin docs
Howard Chu [Mon, 29 Jul 2013 13:50:18 +0000 (06:50 -0700)]
ITS#7645, #5655 TLSProtocolMin docs

10 years agoITS#5655 cleanup
Howard Chu [Mon, 29 Jul 2013 13:40:02 +0000 (06:40 -0700)]
ITS#5655 cleanup

10 years agoITS#5655 TLS_PROTOCOL_MIN setting
Philip Guenther [Mon, 29 Jul 2013 13:38:27 +0000 (06:38 -0700)]
ITS#5655 TLS_PROTOCOL_MIN setting

10 years agoITS#7641
Quanah Gibson-Mount [Mon, 29 Jul 2013 19:34:19 +0000 (12:34 -0700)]
ITS#7641

10 years agoITS#7641 don't muck with controls if slapi doesn't use them
Timothy Pearson [Fri, 26 Jul 2013 20:15:58 +0000 (13:15 -0700)]
ITS#7641 don't muck with controls if slapi doesn't use them

10 years agoITS#7636
Quanah Gibson-Mount [Mon, 29 Jul 2013 19:33:02 +0000 (12:33 -0700)]
ITS#7636

10 years agoITS#7636 slapi: don't free filterstr if filter didn't change
Howard Chu [Wed, 10 Jul 2013 19:56:04 +0000 (12:56 -0700)]
ITS#7636 slapi: don't free filterstr if filter didn't change

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 29 Jul 2013 19:29:25 +0000 (12:29 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

10 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 29 Jul 2013 19:29:12 +0000 (12:29 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4