upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-17 09:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
21153 commits 38 branches 313 tags 89 MiB
Commit graph

3938 commits

Author SHA1 Message Date
Hallvard Furuseth
07dc79a7c3 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.
 2013-10-03 23:59:24 +02:00
Howard Chu
79eac42c0f s/MDB_NORDLOCK/MDB_NOLOCK/ 
Leave all lock management to the caller.
 2013-10-03 10:26:44 -07:00
Howard Chu
a1685c3ef7 More doc for MDB_NORDLOCK 2013-10-01 23:36:57 -07:00
Howard Chu
f739940547 Add MDB_NORDLOCK to omit all reader table usage 
Calling app wants to manage its own locking.
 2013-10-01 13:16:38 -07:00
Emily Backes
85003d8a54 ITS#7712 Fix lock ordering in libldap abandon 2013-09-30 15:31:27 -07:00
Hallvard Furuseth
e3f6c152c5 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.
 2013-09-23 20:21:11 +02:00
Hallvard Furuseth
2980bd30f5 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.
 2013-09-23 20:21:11 +02:00
Hallvard Furuseth
31cfca9316 Tweak MDB_DEBUG output 2013-09-23 20:20:42 +02:00
Hallvard Furuseth
7bdb5be0b5 Rename SWAP() to avoid conflict with sqlightning. 
Happened since sqlightning #includes mdb.c, midl.c.
 2013-09-23 20:20:05 +02:00
Hallvard Furuseth
52cb8b3417 mdb_page_unspill(): Rename local vars. 
The names have caused bugs, "txn" was treated as
the current transaction.
 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
8e1d10e828 ITS#7515 Fix mdb_page_unspill() in nested txn. 
Malloc a page in this txn, not in a parent.
 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
a3b3482854 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.
 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
bc48a40621 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().
 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
cfe262dce9 ITS#7515 mdb_pages_xkeep(): Careful about xcursors. 
Don't prod sub-pages or pages referring to uninitialized xcursors.
 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
5b96d68faf mdb_pages_xkeep(): Reformat, use common flag mask 2013-09-23 20:13:27 +02:00
Hallvard Furuseth
5b21307f29 Update MDB documentation and comments. 2013-09-23 20:09:47 +02:00
Hallvard Furuseth
3335b25834 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.
 2013-09-23 20:07:29 +02:00
Howard Chu
912e09fd04 ITS#7681 fix 18a07eb7c2 
Set rc=0 when taking the SET_RANGE branch
 2013-09-21 14:51:01 -07:00
Howard Chu
0144da6eab ITS#7701 fix mdb_rebalance 
Must copy tmp cursor back to real cursor when merging into tmp cursor.
 2013-09-21 14:37:11 -07:00
Quanah Gibson-Mount
1a712bf18e Enable features that were hidden behind LDAP_DEVEL 2013-09-19 09:50:52 -07:00
Howard Chu
16f8b0902c ITS#7398 add LDAP_OPT_X_TLS_PEERCERT 
retrieve peer cert for an active TLS session
 2013-09-10 04:31:39 -07:00
Howard Chu
0045e56c34 ITS#7683 more for tls version/cipher info 
Add LDAP_OPT_X_TLS_VERSION / LDAP_OPT_X_TLS_CIPHER for
retrieving from an LDAP session handle. Update ldap_get_option(3).
 2013-09-09 11:52:10 -07:00
Howard Chu
057b2bab20 Merge remote-tracking branch 'origin/mdb.master' 2013-09-09 08:30:52 -07:00
Howard Chu
0f842a2710 Release 0.9.8 2013-09-09 08:29:46 -07:00
Howard Chu
721e46fe66 ITS#7595 don't try to use EC if OpenSSL lacks it 2013-09-08 06:32:23 -07:00
Howard Chu
7d6d6944c5 ITS#7683 log tls prot/cipher info 
Note: I could not test the MozNSS patch due to the absence of
NSS PEM support on my machine. Given the review comments in
https://bugzilla.mozilla.org/show_bug.cgi?id=402712 I doubt that
trustworthy PEM support will be appearing for MozNSS any time soon.
 2013-09-07 12:22:09 -07:00
Howard Chu
e631ce808e ITS#7595 Add Elliptic Curve support for OpenSSL 2013-09-07 09:47:40 -07:00
Howard Chu
0205e83f46 ITS#7430 GnuTLS: Avoid use of deprecated function 2013-09-07 09:41:46 -07:00
Howard Chu
3e100bb54d Add GnuTLS channel binding support 2013-09-07 09:38:47 -07:00
Howard Chu
cb00bb0218 Fix double-free on ciphersuite parse failure 
GnuTLS does an implicit free on failure.
 2013-09-07 08:58:25 -07:00
Howard Chu
cfeb28412c ITS#7506 fix prev commit 
The patch unconditionally enabled DHparams, which is a significant
change of behavior. Reverting to previous behavior, which only enables
DH use if a DHparam file was configured.
 2013-09-07 06:39:53 -07:00
Ben Jencks
6f120920d3 ITS#7506 tls_o.c: Fix Diffie-Hellman parameter usage. 
If a DHParamFile or olcDHParamFile is specified, then it will be used,
otherwise a hardcoded 1024 bit parameter will be used. This allows the use of
larger parameters; previously only 512 or 1024 bit parameters would ever be
used.
 2013-09-07 06:33:39 -07:00
Howard Chu
a72d1ffe0f ITS#7506 cleanup prev commit 2013-09-07 06:31:58 -07:00
Ben Jencks
622d13a32e ITS#7506 tls_g.c: Properly support DHParamFile. 
If a DHParamFile or olcDHParamFile is specified then it will be loaded. This
allows use of DHE/EDH cipher suites which was previously impossible with
GnuTLS.
 2013-09-07 06:29:14 -07:00
Howard Chu
2851b22315 Merge remote-tracking branch 'origin/mdb.master' 2013-09-06 12:54:02 -07:00
Howard Chu
7e58cc0fd3 updates 2013-09-05 16:23:49 -07:00
Salvador Ortiz
cfc13e2b48 ITS#7682 In mdb_env_copy retry open if O_DIRECT fails 2013-09-05 16:20:18 -07:00
Howard Chu
90c55178db More for 5f6fa8c042 
Reset delete flag in cursor_put().
 2013-09-05 06:02:07 -07:00
Claude Brisson
18a07eb7c2 ITS#7681 fix mdb_cursor_set behaviour for MDB_SET_RANGE 2013-09-05 05:57:03 -07:00
Howard Chu
448b5269a8 Fix uninit'd poolqs in prev commit 2013-09-03 17:29:32 -07:00
Howard Chu
5f6fa8c042 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.
 2013-09-03 16:10:20 -07:00
Howard Chu
0ef9e6107b More for threadpool queues 
Allow dynamic reconfig
 2013-09-03 15:06:37 -07:00
Howard Chu
8d8ad70026 Merge remote-tracking branch 'origin/mdb.master' 2013-08-28 20:45:12 -07:00
Howard Chu
3d59ca3558 Add a changelog 2013-08-28 20:22:41 -07:00
Howard Chu
5c5300c604 Bump version to 0.9.8 2013-08-28 19:17:25 -07:00
Howard Chu
2e7130cab0 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.
 2013-08-28 19:12:59 -07:00
Howard Chu
c1bb7e7610 Merge remote-tracking branch 'origin/mdb.master' 2013-08-27 06:34:59 -07:00
Howard Chu
2a28686e4f ITS#7672 fix mdb_dbi_flags 
Use a txn instead of env argument. Only return persistent flags.
 2013-08-27 06:28:30 -07:00
Howard Chu
ca310ebff4 Add channel binding support 
Currently only implemented for OpenSSL.
Needs an option to set the criticality flag.
 2013-08-26 23:31:48 -07:00
Hallvard Furuseth
4dd10d70a5 mdb_page_unspill(): Fix dirty_room in nested txn 2013-08-25 23:59:58 +02:00
Howard Chu
56c2a8d04a Another take on spill_pgs and deletes 2013-08-24 20:37:45 +01:00
Howard Chu
b917266ca1 Cleanup prev commit 2013-08-24 11:54:05 -07:00
Howard Chu
41bf5c906a Speedup deletion from spill_pgs 2013-08-24 19:51:47 +01:00
Howard Chu
6423c87749 ITS#7671 always return the key for a dup val 2013-08-23 07:36:07 -07:00
Howard Chu
e15a90c762 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.
 2013-08-23 04:55:41 -07:00
Hallvard Furuseth
6616034eb9 mdb_page_spill(): Fix nested txn mt_dirty_room 2013-08-23 13:52:35 +02:00
Hallvard Furuseth
392be3a7c6 Simplify last commits 2013-08-23 13:52:35 +02:00
Howard Chu
45c4ed1805 Tweak prev commit 
If somehow "need" is larger than the list size, don't
try to fake out the dirty list.
 2013-08-22 21:29:53 -07:00
Howard Chu
7b1db13050 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.
 2013-08-22 18:51:48 -07:00
Howard Chu
c22a7d98ec Update caveats now that mdb_reader_check exists 2013-08-20 17:37:53 -07:00
Howard Chu
50ab5bb1ed Cleanup comments in prev commit 2013-08-19 14:25:13 -07:00
Howard Chu
0c86184bae More fixes for prev commit 2013-08-19 13:54:17 -07:00
Howard Chu
eaa3469736 Fix 34f832faee 
Lock ordering issues
 2013-08-19 04:28:05 -07:00
Howard Chu
34f832faee Multiple queues per threadpool 2013-08-16 19:04:49 -07:00
Howard Chu
9121a473de Merge remote-tracking branch 'origin/mdb.master' 2013-08-16 06:44:58 -07:00
Howard Chu
214e9ed07d Silence warnings 2013-08-14 09:57:25 -07:00
Hallvard Furuseth
82b27c09c9 Tweak ITS#7615 fix: Obey strict-aliasing rules. 
Do not access a long long as an array of longs.
 2013-08-14 15:21:59 +02:00
Howard Chu
2b7237bdcf Merge remote-tracking branch 'origin/mdb.master' 2013-08-13 13:35:46 -07:00
Howard Chu
76f0a02485 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.
 2013-08-13 13:12:47 -07:00
Howard Chu
a77ffaaa5d Revert "ITS#7664 delete lockfile if there is no environment" 
This reverts commit 8725838409.
 2013-08-13 13:05:32 -07:00
Howard Chu
beca9bbb15 Merge remote-tracking branch 'origin/mdb.master' 2013-08-13 11:36:50 -07:00
Howard Chu
8725838409 ITS#7664 delete lockfile if there is no environment 2013-08-13 11:34:32 -07:00
Howard Chu
c740cbc1e5 Merge remote-tracking branch 'origin/mdb.master' 2013-08-12 12:49:24 -07:00
Howard Chu
eaeeecc3b2 Fix uninit'd mem ref in mdb_page_split 
Don't compare cursors beyond their depth. (detected by valgrind)
 2013-08-12 12:43:42 -07:00
Howard Chu
6e9762f9e7 Merge remote-tracking branch 'origin/mdb.master' 2013-08-11 17:27:17 -07:00
Howard Chu
6ecee1cbf9 Tweak NODUPDATA flag check 
Should allow for the possibility of future flag combos.
 2013-08-11 17:25:00 -07:00
Howard Chu
76c8fd5c6c Merge remote-tracking branch 'origin/mdb.master' 2013-08-11 17:18:20 -07:00
Howard Chu
5a5d33ff33 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.
 2013-08-11 17:15:03 -07:00
Howard Chu
ab44974baf Merge remote-tracking branch 'origin/mdb.master' 2013-08-10 16:20:47 -07:00
Howard Chu
76f8b77e36 Point to mdb.c for docs on macros in Makefile 2013-08-10 16:19:44 -07:00
Howard Chu
634dcb507e Merge remote-tracking branch 'origin/mdb.master' 2013-08-10 05:05:57 -07:00
Hallvard Furuseth
9c49ef1d71 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.
 2013-08-10 13:50:10 +02:00
Hallvard Furuseth
76d31573a4 Refuse ops on bad txns 2013-08-10 13:23:30 +02:00
Hallvard Furuseth
9beea541e1 Replace EINVALs with generalized MDB_INCOMPATIBLE. 
Also check xcursor instead of DUPSORT, it's slightly briefer.
 2013-08-10 13:23:30 +02:00
John Hewson
ef899fe84e ITS#7656 fix install target 2013-08-10 04:13:24 -07:00
Salvador Ortiz
86551828ab ITS#7660 Add mdb_txn_env to API 2013-08-10 04:06:16 -07:00
Hallvard Furuseth
5645812f41 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.
 2013-08-10 12:29:45 +02:00
Salvador Ortiz
92eb220184 ITS#7661 mdb_dbi_flags(): Allow main DBI 2013-08-10 09:42:19 +02:00
Howard Chu
968a2872dd Merge remote-tracking branch 'origin/mdb.master' 2013-08-09 09:07:14 -07:00
Salvador Ortiz
335f0e4cee mdb_del must ignore data if db not opened with MDB_DUPSORT 2013-08-09 09:05:44 -07:00
Howard Chu
e766d02f67 Merge remote-tracking branch 'origin/mdb.master' 2013-08-09 08:46:47 -07:00
Howard Chu
1ac3c8308f Add mdb_env_get_maxkeysize() 2013-08-09 04:51:33 -07:00
Hallvard Furuseth
1ecd86b14c Replace unpredictable EINVAL error returns. 
Return EINVAL only for simple programmer errors.
 2013-08-09 13:05:14 +02:00
Hallvard Furuseth
22c104c5d7 Re-fix reader-pid code 2013-08-09 12:54:42 +02:00
Hallvard Furuseth
38b11b1de1 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.
 2013-08-08 19:57:52 +02:00
Hallvard Furuseth
2bd5d8102e 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.
 2013-08-08 19:57:52 +02:00
Hallvard Furuseth
c3547e81f3 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.
 2013-08-08 19:57:51 +02:00
Hallvard Furuseth
ee5ba85565 Set MDB_TXN_ERROR when inconsistent txn state 2013-08-08 19:57:51 +02:00
Hallvard Furuseth
ffd2287b55 Factor out MDB_env. 2013-08-08 19:54:54 +02:00
Hallvard Furuseth
d66739f947 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.
 2013-08-08 19:43:04 +02:00