]> git.sur5r.net Git - openldap/log
openldap
11 years agoITS#7588 plug memleak
Howard Chu [Mon, 27 May 2013 18:17:05 +0000 (11:17 -0700)]
ITS#7588 plug memleak

11 years agoITS#7608
Quanah Gibson-Mount [Tue, 28 May 2013 17:04:18 +0000 (10:04 -0700)]
ITS#7608

11 years agoITS#7608 allow slapadd w/unknown RDNs for config DB
Howard Chu [Tue, 28 May 2013 01:51:34 +0000 (18:51 -0700)]
ITS#7608 allow slapadd w/unknown RDNs for config DB

11 years agoITS#7608 promoted attrs must have valid ad_index
Howard Chu [Mon, 27 May 2013 15:57:15 +0000 (08:57 -0700)]
ITS#7608 promoted attrs must have valid ad_index

11 years agoITS#7604
Quanah Gibson-Mount [Fri, 24 May 2013 19:32:28 +0000 (12:32 -0700)]
ITS#7604

11 years agoITS#7604 fix modrdn, base-scope search
Howard Chu [Fri, 24 May 2013 18:08:25 +0000 (11:08 -0700)]
ITS#7604 fix modrdn, base-scope search

11 years agoITS#7588 fix possible NULL-deref in prev commit
Howard Chu [Fri, 24 May 2013 15:23:44 +0000 (08:23 -0700)]
ITS#7588 fix possible NULL-deref in prev commit

11 years ago7582, 7583
Quanah Gibson-Mount [Fri, 24 May 2013 19:31:11 +0000 (12:31 -0700)]
7582, 7583

11 years agoITS#7583 Fix ldap_init_fd() for LDAP_PROTO_UDP
Stef Walter [Fri, 3 May 2013 07:20:14 +0000 (09:20 +0200)]
ITS#7583 Fix ldap_init_fd() for LDAP_PROTO_UDP

ldap_init_fd() tried to handle UDP sockets but was missing
certain key pieces to make it work. Fill in the address and
set the UDP flag correctly.

11 years agoITS#7582 CLDAP, avoid ref to uninit'd memory
Howard Chu [Thu, 23 May 2013 19:36:15 +0000 (12:36 -0700)]
ITS#7582 CLDAP, avoid ref to uninit'd memory

11 years agoITS#7581 more for prev commit
Howard Chu [Thu, 23 May 2013 18:45:05 +0000 (11:45 -0700)]
ITS#7581 more for prev commit

11 years agoITS#7581
Quanah Gibson-Mount [Fri, 24 May 2013 19:28:52 +0000 (12:28 -0700)]
ITS#7581

11 years agoITS#7581 fix back-meta config checks
Howard Chu [Thu, 23 May 2013 17:17:15 +0000 (10:17 -0700)]
ITS#7581 fix back-meta config checks

Allow base entry to be added online with targets
added later. Add SLAP_SERVER_RUNNING flag to note
that main slap_startup has already occurred.

11 years agoITS#7577 more alias deref checks
Howard Chu [Fri, 17 May 2013 16:15:36 +0000 (09:15 -0700)]
ITS#7577 more alias deref checks

11 years agoCleanup, fix syncrepl config errmsg
Howard Chu [Fri, 17 May 2013 14:51:23 +0000 (07:51 -0700)]
Cleanup, fix syncrepl config errmsg

11 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Fri, 17 May 2013 00:54:07 +0000 (17:54 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

11 years agoInclude <netinet/in.h> for Solaris 8
Howard Chu [Wed, 15 May 2013 18:50:40 +0000 (11:50 -0700)]
Include <netinet/in.h> for Solaris 8

Needed for <resolv.h>, which is needed for BYTE_ORDER.

11 years agoITS#7588
Quanah Gibson-Mount [Wed, 15 May 2013 00:14:16 +0000 (17:14 -0700)]
ITS#7588

11 years agoITS#7588 fix double-free for sorted paged search
Howard Chu [Mon, 13 May 2013 15:12:40 +0000 (08:12 -0700)]
ITS#7588 fix double-free for sorted paged search

11 years agoITS#7592
Quanah Gibson-Mount [Wed, 15 May 2013 00:13:46 +0000 (17:13 -0700)]
ITS#7592

11 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Wed, 15 May 2013 00:13:07 +0000 (17:13 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

11 years agoFix mdb_page_split - nested split
Howard Chu [Tue, 14 May 2013 23:57:50 +0000 (16:57 -0700)]
Fix mdb_page_split - nested split

If updating a page's separator triggers a split in its parent,
we may have missed adjusting the parent's cursor position.

11 years agoDoxygen cleanup
Howard Chu [Mon, 13 May 2013 19:36:47 +0000 (12:36 -0700)]
Doxygen cleanup

11 years agoITS#7577
Quanah Gibson-Mount [Fri, 10 May 2013 20:32:09 +0000 (13:32 -0700)]
ITS#7577

11 years agoITS#7577 more for previous commit
Howard Chu [Sun, 28 Apr 2013 19:47:14 +0000 (12:47 -0700)]
ITS#7577 more for previous commit

11 years agoITS#7577 alias fixes
Howard Chu [Wed, 24 Apr 2013 10:11:14 +0000 (03:11 -0700)]
ITS#7577 alias fixes

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

11 years agoFix 66c839f0292d9aea12bf93ef6568ac2bd2ca0fc8
Howard Chu [Fri, 10 May 2013 12:56:16 +0000 (05:56 -0700)]
Fix 66c839f0292d9aea12bf93ef6568ac2bd2ca0fc8

Forgot #include <errno.h>

11 years agoRefactor mdb_midl_append, add mdb_midl_grow()
Howard Chu [Fri, 10 May 2013 00:27:29 +0000 (17:27 -0700)]
Refactor mdb_midl_append, add mdb_midl_grow()

11 years agoITS#7515 Fix nested transaction error handling.
Hallvard Furuseth [Sun, 5 May 2013 13:13:31 +0000 (15:13 +0200)]
ITS#7515 Fix nested transaction error handling.

mdb_txn_begin(): Do not free(mt_free_pgs), it needs mdb_midl_free().
mdb_txn_commit(): Catch commit(child) error.

11 years agoFix mdb_env_close(unopened MDB_env).
Hallvard Furuseth [Sun, 5 May 2013 12:26:05 +0000 (14:26 +0200)]
Fix mdb_env_close(unopened MDB_env).

Do not try to scan me_dbxs in a closed/never-opened MDB_env.
Broken by 7d643d3acb94a6d7306330b550fce0e5755444a9
and 151c416b460b02cd96502a47189cda19ab651ada.

11 years agoSimplify/cleanup mdb_cursor_init, C_ALLOCD.
Hallvard Furuseth [Sat, 4 May 2013 10:53:43 +0000 (12:53 +0200)]
Simplify/cleanup mdb_cursor_init, C_ALLOCD.

No real change.
mdb_cursor_init() checks if it needs mx, so pass it unconditionally.
Set C_ALLOCD for shadow cursors, for clarity. (It was always set as
it should anyway from the origin cursor, which would have C_ALLOCD.)

11 years agoMDB warning cleanup.
Hallvard Furuseth [Sat, 4 May 2013 10:41:28 +0000 (12:41 +0200)]
MDB warning cleanup.

Unused function when MDB_DEBUG. Unused 'excl' param.

11 years agomdb_dcmp(): Assume the database has MDB_DUPSORT.
Hallvard Furuseth [Sat, 4 May 2013 10:34:49 +0000 (12:34 +0200)]
mdb_dcmp(): Assume the database has MDB_DUPSORT.

There was little point in returning EINVAL when not: Comparing (A,B)
and (B,A) would claim (A > B && B > A), which could confuse callers.

11 years agoUpdate MDB doc: Cursors, DB handles, data lifetime
Hallvard Furuseth [Sat, 4 May 2013 10:34:20 +0000 (12:34 +0200)]
Update MDB doc: Cursors, DB handles, data lifetime

11 years agoAllow mdb_cursor_close() after readonly txn ends.
Hallvard Furuseth [Sat, 4 May 2013 10:34:02 +0000 (12:34 +0200)]
Allow mdb_cursor_close() after readonly txn ends.

Catch mdb_cursor_renew(write txn's cursor).  Add flag C_UNTRACK, so
mdb_cursor_close need not peek inside a possibly-freed readonly txn.

11 years agoClose cursors when commit(writer). Factor out code.
Hallvard Furuseth [Sat, 4 May 2013 10:33:06 +0000 (12:33 +0200)]
Close cursors when commit(writer). Factor out code.

Close remaining cursors when committing a write txn. The doc says this
happens, and it avoids cursor tracking when updating mainDB + freeDB.

Rename mdb_cursor_merge() -> mdb_cursors_close() for code reuse,
and add a merge option.  Simplify its loop a bit.

Factor out cleanup of DBIs.

11 years agoPlug txn leak and MDB_NOTLS slot leaks on error.
Hallvard Furuseth [Sat, 4 May 2013 10:31:31 +0000 (12:31 +0200)]
Plug txn leak and MDB_NOTLS slot leaks on error.

On mdb_env_copy() error: Abort the txn.
On mdb_txn_renew0() error: Release new MDB_NOTLS reader slot.

11 years agoCleaner "Support mdb_txn_abort(a reset txn)".
Hallvard Furuseth [Sat, 4 May 2013 08:03:19 +0000 (10:03 +0200)]
Cleaner "Support mdb_txn_abort(a reset txn)".

Redo 8a562f560edcc6417672df453c4e626dfb4c4024 so !mt_dbxs indicates
"txn was reset", so mt_numdbs gets one magic value instead of two.

11 years agoUpdate fixes for dbi_open/close, ITS#7515.
Hallvard Furuseth [Sat, 4 May 2013 08:03:19 +0000 (10:03 +0200)]
Update fixes for dbi_open/close, ITS#7515.

Reset me_dbflags[dbi] when closing DBI, to get rid of MDB_VALID flag.
mdb_env_close(): Re-fix DB-name memleak. DBIs > me_numdbs may exist.

11 years agoAllow reading freelist while working on it
Howard Chu [Thu, 2 May 2013 05:43:35 +0000 (22:43 -0700)]
Allow reading freelist while working on it

The circular dependency issues appear to have been resolved.
Still, need to watch closely, maybe revert this change if
problems arise.

11 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Wed, 1 May 2013 14:41:20 +0000 (07:41 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

11 years agoAvoid assert
Howard Chu [Wed, 1 May 2013 04:09:09 +0000 (21:09 -0700)]
Avoid assert

Due to underfilled branch page. We're in the process of merging/moving
nodes to it because we already know it's underfilled. Took this approach
rather than just removing the assert in mdb_page_search_root, because
that assert may yet catch other situations we don't know about.

(Although, it has been there since the original commit of mdb.c and
has never triggered any other times...)

11 years agoPlug mdb_cursor_renew() memleak
Hallvard Furuseth [Mon, 22 Apr 2013 18:46:56 +0000 (20:46 +0200)]
Plug mdb_cursor_renew() memleak

11 years agoITS#7513
Quanah Gibson-Mount [Thu, 25 Apr 2013 00:05:51 +0000 (17:05 -0700)]
ITS#7513

11 years agoITS#7513 added TCP keepalive support to back-meta
Ted C. Cheng [Wed, 30 Jan 2013 19:58:14 +0000 (11:58 -0800)]
ITS#7513 added TCP keepalive support to back-meta

11 years agoDrop ldap_int_sasl_mutex
Howard Chu [Wed, 24 Apr 2013 07:52:52 +0000 (00:52 -0700)]
Drop ldap_int_sasl_mutex

It was introduced for Cyrus 1.5 in 2001; we've been on 2.x since 2002 and
Cyrus does its own locking when needed.

11 years agoITS#7524
Quanah Gibson-Mount [Thu, 25 Apr 2013 00:04:37 +0000 (17:04 -0700)]
ITS#7524

11 years agoDon't expire a conn if it's still referenced
Howard Chu [Wed, 24 Apr 2013 07:27:26 +0000 (00:27 -0700)]
Don't expire a conn if it's still referenced

11 years agoITS#7524 make sure binding flag is set before trying to bind
Jorge Perez Burgos [Wed, 24 Apr 2013 07:23:53 +0000 (00:23 -0700)]
ITS#7524 make sure binding flag is set before trying to bind

11 years agoITS#7518 fix manpage
Howard Chu [Tue, 23 Apr 2013 21:44:55 +0000 (14:44 -0700)]
ITS#7518 fix manpage

11 years agoITS#7518 resync nss-pam-ldapd files
Howard Chu [Tue, 23 Apr 2013 19:49:25 +0000 (12:49 -0700)]
ITS#7518 resync nss-pam-ldapd files

Also note minimum version required.

11 years agoFix MDB_LAST, reset cursor index
Howard Chu [Sun, 21 Apr 2013 02:30:06 +0000 (19:30 -0700)]
Fix MDB_LAST, reset cursor index

11 years agoFix typo from 7aba5f5ab92a3fa92de001edb2c5ff4b04fd7d0d
Howard Chu [Sat, 20 Apr 2013 16:47:33 +0000 (09:47 -0700)]
Fix typo from 7aba5f5ab92a3fa92de001edb2c5ff4b04fd7d0d

11 years agoTweak comments/readability.
Hallvard Furuseth [Thu, 18 Apr 2013 06:00:03 +0000 (08:00 +0200)]
Tweak comments/readability.

Show MDB_PERSISTENT/MDB_VALID/DB_VALID relationship.
mdb_txn_renew0(): Remove obsolete "cannot fail" comment.

11 years agoAdd MDB_NOTLS envflag.
Howard Chu [Thu, 18 Apr 2013 02:17:03 +0000 (04:17 +0200)]
Add MDB_NOTLS envflag.

11 years agoCatch MDB txn reuse/sync errors.
Hallvard Furuseth [Thu, 18 Apr 2013 02:16:07 +0000 (04:16 +0200)]
Catch MDB txn reuse/sync errors.

11 years agoSupport mdb_txn_abort(a reset txn).
Hallvard Furuseth [Thu, 18 Apr 2013 02:15:45 +0000 (04:15 +0200)]
Support mdb_txn_abort(a reset txn).

11 years agoCleanup for TLS key and read-only filesystem.
Hallvard Furuseth [Thu, 18 Apr 2013 02:15:13 +0000 (04:15 +0200)]
Cleanup for TLS key and read-only filesystem.

Move key init into mdb_env_setup_locks().
Don't create unused TLS key when read-only filesystem.
Drop internal flag MDB_ROFS, we can instead test either
!me_txns, !mt_u.reader or me_lfd==INVALID_HANDLE_VALUE.

11 years agoClean up MDB_env setup.
Hallvard Furuseth [Thu, 18 Apr 2013 02:13:43 +0000 (04:13 +0200)]
Clean up MDB_env setup.

Malloc before I/O. Avoids possible malloc error after I/O.
Don't allocate dirty & free lists when MDB_RDONLY.
Factor out code.

11 years agoFix mdb_rebalance
Howard Chu [Wed, 17 Apr 2013 21:33:41 +0000 (14:33 -0700)]
Fix mdb_rebalance

Don't do anything with (fake root) subpages

11 years agoITS#7574 blind fix
Howard Chu [Tue, 16 Apr 2013 19:05:03 +0000 (12:05 -0700)]
ITS#7574 blind fix

Fix 227329c8e1fb818548f1936f5dc1349ffd733523, don't persist
the MDB_VALID bit in db.md_flags.

11 years agofix prev commit
Howard Chu [Mon, 15 Apr 2013 16:30:39 +0000 (09:30 -0700)]
fix prev commit

11 years agoFix mdb_rebalance
Howard Chu [Mon, 15 Apr 2013 06:59:54 +0000 (23:59 -0700)]
Fix mdb_rebalance

Need to check NUMKEYS as well as fill threshold, when deciding
whether to change anything. Don't let the page drop below the
minimum number of keys.

11 years agoRevert "ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE"
Howard Chu [Sun, 14 Apr 2013 23:53:30 +0000 (16:53 -0700)]
Revert "ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE"

This reverts commit 372b3ddb85bef953fb548fbf2b9ef0cba4e3c8ed.

Original code works as designed.

11 years agoITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE
Claude Brisson [Wed, 10 Apr 2013 12:40:49 +0000 (14:40 +0200)]
ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE

11 years agoITS#7568
Quanah Gibson-Mount [Thu, 11 Apr 2013 15:12:03 +0000 (08:12 -0700)]
ITS#7568

11 years agoITS#7568 Add -Q to slaptest's help
Jan Synacek [Tue, 9 Apr 2013 10:42:31 +0000 (12:42 +0200)]
ITS#7568 Add -Q to slaptest's help

11 years agoITS#7568 Fix typos in ldap.conf.5
Jan Synacek [Tue, 9 Apr 2013 10:41:38 +0000 (12:41 +0200)]
ITS#7568 Fix typos in ldap.conf.5

11 years agoITS#7569
Quanah Gibson-Mount [Thu, 11 Apr 2013 15:09:24 +0000 (08:09 -0700)]
ITS#7569

11 years agoITS#7569 fixed a group enumeration bug (Symas#2255)
Ted C. Cheng [Wed, 10 Apr 2013 23:01:16 +0000 (16:01 -0700)]
ITS#7569 fixed a group enumeration bug (Symas#2255)

11 years agoITS#6365
Quanah Gibson-Mount [Thu, 11 Apr 2013 15:07:00 +0000 (08:07 -0700)]
ITS#6365

11 years agoITS#6365 wait for read locks in tool mode
Howard Chu [Thu, 7 Feb 2013 18:23:25 +0000 (18:23 +0000)]
ITS#6365 wait for read locks in tool mode

Fix commit e5b96f2c764f2ca8106560a9e46d3a9880cc2a12

11 years agoITS#7562
Quanah Gibson-Mount [Mon, 8 Apr 2013 02:47:34 +0000 (19:47 -0700)]
ITS#7562

11 years agono need to mention replog any longer (ITS#7562)
Pierangelo Masarati [Sat, 6 Apr 2013 18:30:27 +0000 (20:30 +0200)]
no need to mention replog any longer (ITS#7562)

11 years agoITS#7556,ITS#7515,ITS#7561
Quanah Gibson-Mount [Mon, 8 Apr 2013 02:45:13 +0000 (19:45 -0700)]
ITS#7556,ITS#7515,ITS#7561

11 years agoattrdb fixes
Howard Chu [Wed, 3 Apr 2013 22:04:01 +0000 (15:04 -0700)]
attrdb fixes

11 years agoMerge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Mon, 8 Apr 2013 02:38:11 +0000 (19:38 -0700)]
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

11 years agoFix 227329c8e1fb818548f1936f5dc1349ffd73352
Howard Chu [Mon, 8 Apr 2013 02:21:46 +0000 (19:21 -0700)]
Fix 227329c8e1fb818548f1936f5dc1349ffd73352

mdb_dbi_close() must allow any dbi < maxdbs, since opens in an
uncommitted txn don't increment env->me_numdbs.

11 years agoRevert "Fix 6beaad52129da5353fd40c0ec48e6a78c4f71a2e"
Howard Chu [Fri, 5 Apr 2013 10:44:56 +0000 (03:44 -0700)]
Revert "Fix 6beaad52129da5353fd40c0ec48e6a78c4f71a2e"

This reverts commit 8eef7a4275eda8f2fa2e0d1e67c1d5cbcd91607e.
Previous commit was correct, duplicate keys should not appear here.

11 years agoFixes for dbi_open/close, ITS#7515
Howard Chu [Tue, 2 Apr 2013 18:25:44 +0000 (11:25 -0700)]
Fixes for dbi_open/close, ITS#7515

11 years agoITS#7561 Fix mdb_drop bugs
Howard Chu [Thu, 4 Apr 2013 23:16:25 +0000 (16:16 -0700)]
ITS#7561 Fix mdb_drop bugs

Check for overflow pages, reset cursor position properly.

11 years agoFix 6beaad52129da5353fd40c0ec48e6a78c4f71a2e
Howard Chu [Thu, 4 Apr 2013 14:25:21 +0000 (07:25 -0700)]
Fix 6beaad52129da5353fd40c0ec48e6a78c4f71a2e

In APPEND don't immediately reject matching key, since this
is valid for APPENDDUP.

11 years agoFix d3990eb2f8b2944782604a2ca7bd52e08c58fc3e
Howard Chu [Thu, 4 Apr 2013 01:26:41 +0000 (18:26 -0700)]
Fix d3990eb2f8b2944782604a2ca7bd52e08c58fc3e

Append mode should *reject* keys that are too small.
Also allow APPENDDUP in mdb_put().

11 years agoFix rebalance when collapsing root page
Howard Chu [Tue, 2 Apr 2013 03:34:40 +0000 (20:34 -0700)]
Fix rebalance when collapsing root page

When fixing other cursors, must also fix their depth.

11 years agoMore fixes for MDB_LAST
Howard Chu [Tue, 2 Apr 2013 02:49:40 +0000 (19:49 -0700)]
More fixes for MDB_LAST

Make sure C_INITIALIZED gets set on successful call

11 years agoITS#7556 fix cursor_sibling for PREV
Howard Chu [Tue, 2 Apr 2013 02:06:05 +0000 (19:06 -0700)]
ITS#7556 fix cursor_sibling for PREV

11 years agoReturn to RE
Quanah Gibson-Mount [Mon, 1 Apr 2013 23:51:48 +0000 (16:51 -0700)]
Return to RE

11 years agoPlug MDB memory leak of DB names.
Hallvard Furuseth [Sun, 31 Mar 2013 21:50:02 +0000 (23:50 +0200)]
Plug MDB memory leak of DB names.

11 years agoSilence signedness warning
Hallvard Furuseth [Sun, 31 Mar 2013 21:48:10 +0000 (23:48 +0200)]
Silence signedness warning

11 years agoFix MDB_DEBUG compile when no varargs macros.
Hallvard Furuseth [Sun, 31 Mar 2013 21:47:45 +0000 (23:47 +0200)]
Fix MDB_DEBUG compile when no varargs macros.

Variables mdb_debug, mdb_debug_start were used undefined.

11 years agoTweak mode_t def per Hallvard's suggestion
Howard Chu [Sun, 31 Mar 2013 19:56:08 +0000 (20:56 +0100)]
Tweak mode_t def per Hallvard's suggestion

11 years agoMSVC doesn't define mode_t
Howard Chu [Sun, 31 Mar 2013 16:10:43 +0000 (08:10 -0800)]
MSVC doesn't define mode_t

11 years agoFix CURSOR_LAST/CURSOR_PREV
Howard Chu [Fri, 29 Mar 2013 08:08:06 +0000 (01:08 -0700)]
Fix CURSOR_LAST/CURSOR_PREV

11 years agoPrep for release OPENLDAP_REL_ENG_2_4_35
Quanah Gibson-Mount [Thu, 28 Mar 2013 15:41:51 +0000 (08:41 -0700)]
Prep for release

11 years agoITS#7553
Quanah Gibson-Mount [Wed, 27 Mar 2013 00:46:13 +0000 (17:46 -0700)]
ITS#7553

11 years agoMerge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
Quanah Gibson-Mount [Wed, 27 Mar 2013 00:45:41 +0000 (17:45 -0700)]
Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

11 years agoITS#7553 better fix
Howard Chu [Tue, 26 Mar 2013 18:24:59 +0000 (11:24 -0700)]
ITS#7553 better fix

11 years agoITS#7552
Quanah Gibson-Mount [Tue, 26 Mar 2013 01:48:11 +0000 (18:48 -0700)]
ITS#7552

11 years agoITS#7552 fix for templates with * / +
Howard Chu [Mon, 25 Mar 2013 18:14:01 +0000 (11:14 -0700)]
ITS#7552 fix for templates with * / +