Stefan Metzmacher [Tue, 13 Sep 2011 14:31:58 +0000 (16:31 +0200)]
s3:libsmb: move cli->max_mux to cli->conn.smb1.server.max_mux
metze
Stefan Metzmacher [Tue, 13 Sep 2011 13:00:59 +0000 (15:00 +0200)]
s3:libsmb: move cli->max_xmit to cli->conn.smb1.max_xmit
And keep cli->conn.smb1.client.max_xmit and
cli->conn.smb1.server.max_xmit.
metze
Stefan Metzmacher [Tue, 13 Sep 2011 13:07:29 +0000 (15:07 +0200)]
s3:libsmb: move cli->smb1.mid to cli->conn.smb1.mid
metze
Stefan Metzmacher [Tue, 13 Sep 2011 13:00:59 +0000 (15:00 +0200)]
s3:libsmb: move cli->capabilities to cli->conn.smb1.capabilities
And keep cli->conn.smb1.client.capabilities and
cli->conn.smb1.server_capabilities.
metze
Stefan Metzmacher [Tue, 13 Sep 2011 12:38:38 +0000 (14:38 +0200)]
s3:libsmb: move cli->protocol to cli->conn.protocol
metze
Stefan Metzmacher [Tue, 13 Sep 2011 12:37:29 +0000 (14:37 +0200)]
s3:libsmb: don't set cli->protocol in cli_state_create()
This is done in cli_negprot_done(), when we know the protocol.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 15 11:57:18 CEST 2011 on sn-devel-104
Stefan Metzmacher [Tue, 13 Sep 2011 12:33:31 +0000 (14:33 +0200)]
s3:libsmb: pass max_protocol to cli_negprot()
metze
Stefan Metzmacher [Tue, 13 Sep 2011 12:21:28 +0000 (14:21 +0200)]
s3:libsmb: add basic max_protocol support in cli_negprot()
metze
Stefan Metzmacher [Thu, 8 Sep 2011 15:29:58 +0000 (17:29 +0200)]
s3:libsmb: use local variables in cli_state_create()
We don't need to keep use_spnego, use_level_II_oplocks, force_dos_errors
and force_ascii within struct cli_state.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 15 10:12:17 CEST 2011 on sn-devel-104
Stefan Metzmacher [Thu, 8 Sep 2011 15:28:29 +0000 (17:28 +0200)]
s3:libsmb: use CAP_EXTENDED_SECURITY instead of cli->use_spnego
cli->capabilities contains the negotiated capabilities.
metze
Stefan Metzmacher [Thu, 8 Sep 2011 14:39:14 +0000 (16:39 +0200)]
s3:libsmb: make use of SMB_CAP_BOTH/CLIENT_MASK in cli_session_setup_capabilities()
This matches a w2k3 client.
metze
Stefan Metzmacher [Thu, 8 Sep 2011 14:14:51 +0000 (16:14 +0200)]
s3:libsmb: calculate the negotiated SMB1 capabilities in cli_negprot_done()
We calculate the negotiated capabilities based on the mask for:
- client only flags
- flags used in both directions
- server only flags
metze
Stefan Metzmacher [Thu, 8 Sep 2011 14:06:05 +0000 (16:06 +0200)]
s3:include: add some masks for SMB1 CAP_* flags
The flags are devided into 3 sections:
- client only flags
- flags used in both directions
- server only flags
metze
Stefan Metzmacher [Thu, 8 Sep 2011 14:09:35 +0000 (16:09 +0200)]
s3:libsmb: calculate all SMB1 capabilities we want to support for the connection
We should do this at startup in cli_state_create()
and later calculate the negotiated capabilities in
cli_negprot_done().
metze
Stefan Metzmacher [Thu, 8 Sep 2011 13:50:25 +0000 (15:50 +0200)]
s3:libsmb: no need to reset capabilities in cli_session_setup_lanman2()
This is only used cli->protocol < PROTOCOL_NT1, in which case
cli_negprot_done() has already reset cli->capabilities.
metze
Stefan Metzmacher [Thu, 8 Sep 2011 13:41:29 +0000 (15:41 +0200)]
s3:libsmb: make sure we always set cli->capabilities at the end of cli_negprot_done()
If the server doesn't support PROTOCOL_NT1 we should reset the negotiated
capabilities to 0.
metze
Richard Sharpe [Wed, 14 Sep 2011 23:23:36 +0000 (16:23 -0700)]
Add a missing include file to two VFS modules
Signed-off-by: Jeremy Allison <jra@samba.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 15 02:56:36 CEST 2011 on sn-devel-104
Jeremy Allison [Wed, 14 Sep 2011 21:07:29 +0000 (14:07 -0700)]
Finish commit
8745c70d by Michael Adam.
If you're going to move winbindd_cache.tdb to the state_path, do it *everywhere*.
Found by Ira Cooper <ira@wakeful.net>.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Sep 15 00:43:04 CEST 2011 on sn-devel-104
Stefan Metzmacher [Mon, 12 Sep 2011 01:19:35 +0000 (03:19 +0200)]
s3:libsmb: remove unused cli->is_samba
s3:libsmb: remove unused cli->is_samba
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 12 Sep 2011 00:48:25 +0000 (02:48 +0200)]
s3:libsmb: align chunk_size for cli_pull/push() to a page size of 1024 bytes
s3:libsmb: align chunk_size for cli_pull/push() to a page size of 1024 bytes
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 13 Sep 2011 07:58:34 +0000 (09:58 +0200)]
s3:client.h: remove unused defines
s3:client.h: remove unused defines
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 12 Sep 2011 00:45:22 +0000 (02:45 +0200)]
s3:libsmb: let cli_write_max_bufsize() return the max number of possible bytes
s3:libsmb: let cli_write_max_bufsize() return the max number of possible bytes
We now return what's possible on the wire.
Which is 0x1FFFF - data_offset if CAP_LARGE_WRITEX is given by
the server (without signing) or 0xFFFFFF - data_offset
if CIFS_UNIX_LARGE_READ_CAP is available (without signing/sealing).
Otherwise we return max_xmit - data_offset.
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 12 Sep 2011 00:45:22 +0000 (02:45 +0200)]
s3:libsmb: let cli_read_max_bufsize() return the max number of possible bytes
s3:libsmb: let cli_read_max_bufsize() return the max number of possible bytes
We now return what's possible on the wire.
Which is 0xFFFF if CAP_LARGE_READX is given by the server
or 0xFFFFFF - data_offset if CIFS_UNIX_LARGE_READ_CAP
is available (without signing/sealing). Otherwise we return
max_xmit - data_offset.
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Sat, 10 Sep 2011 09:02:02 +0000 (11:02 +0200)]
s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients.
Windows 2008 R2 (and others) ignore the high bits for the read size.
Unless we're using the unix extentions and the client
uses CIFS_UNIX_LARGE_READ_CAP, we should also ignore
the high bits.
But we still need to support old "smbclient" binaries
and have to check if the client is "Samba".
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Mon, 12 Sep 2011 03:12:50 +0000 (05:12 +0200)]
s3:smbd: remember the client unix capabilities on the connection
metze
Signed-off-by: Jeremy Allison <jra@samba.org>
Jeremy Allison [Wed, 14 Sep 2011 18:59:22 +0000 (11:59 -0700)]
Fix bug #8453 - smbclient segfaults when dialect option -m is used for legacy dialects
Ensure we have valid pointers.
Stefan Metzmacher [Wed, 14 Sep 2011 13:56:23 +0000 (15:56 +0200)]
libcli/auth: add some const to SMBNTencrypt_hash() and SMBNTencrypt()
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Sep 14 19:49:24 CEST 2011 on sn-devel-104
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s4:wrepl_server: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s4:libcli/wrepl: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s4:lib/messaging: let irpc handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s4:librpc/rpc: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s3:winbindd: let wbint handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:57:37 +0000 (17:57 +0200)]
s3:rpc_server: let rpcint handles return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:56:30 +0000 (17:56 +0200)]
s3:rpc_client: return NT_STATUS_CONNECTION_DISCONNECTED
We should return the same in all places
and don't mix NT_STATUS_INVALID_CONNECTION and NT_STATUS_CONNECTION_INVALID.
metze
Stefan Metzmacher [Wed, 14 Sep 2011 15:54:48 +0000 (17:54 +0200)]
s3:libsmb: return NT_STATUS_CONNECTION_DISCONNECTED instead of NT_STATUS_CONNECTION_INVALID
We should return the same in all places.
metze
Stefan Metzmacher [Thu, 8 Sep 2011 15:24:02 +0000 (17:24 +0200)]
s3:torture/run_oplock4: don't set cli->use_level_II_oplocks
Doing this after the session setup is pointless,
as that's the only place where we tell the server we support
level II oplocks.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Sep 14 17:23:46 CEST 2011 on sn-devel-104
Stefan Metzmacher [Wed, 14 Sep 2011 11:04:28 +0000 (13:04 +0200)]
s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byte
metze
Günther Deschner [Wed, 14 Sep 2011 12:20:50 +0000 (14:20 +0200)]
s3-libnet: add missing newlines in debug statement.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Sep 14 15:52:10 CEST 2011 on sn-devel-104
Stefan Metzmacher [Mon, 12 Sep 2011 07:19:06 +0000 (09:19 +0200)]
s3:smbd: make use of better SMB signing negotiation
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Sep 14 09:41:02 CEST 2011 on sn-devel-104
Stefan Metzmacher [Mon, 12 Sep 2011 07:16:27 +0000 (09:16 +0200)]
s3:libsmb: make use of new advanded SMB signing
metze
Stefan Metzmacher [Mon, 12 Sep 2011 07:04:53 +0000 (09:04 +0200)]
s3:smb_signing: add support for easier negotiation of SMB signing
We don't make use of it yet, but it will follow.
metze
Stefan Metzmacher [Fri, 9 Sep 2011 20:44:44 +0000 (22:44 +0200)]
s3:smbd: echo FLAGS2_SMB_SECURITY_SIGNATURES* and the signature field in the reply
This matches what windows is doing.
metze
Rusty Russell [Wed, 14 Sep 2011 02:28:20 +0000 (11:58 +0930)]
tdb2: remove bogus leftover .orig file.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Wed Sep 14 06:06:41 CEST 2011 on sn-devel-104
Jeremy Allison [Tue, 13 Sep 2011 23:42:09 +0000 (16:42 -0700)]
Fix bug #8229 - git patch attached against 3.6.0-rc2 to fix 'widelinks' regression intro'd in 3.2
Add "allow insecure widelinks" to re-enable the ability (requested
by some sites) to have "widelinks = yes" and "unix extensions = yes".
Based on an original patch by Linda Walsh <samba@tlinx.org>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Sep 14 03:55:45 CEST 2011 on sn-devel-104
Rusty Russell [Tue, 13 Sep 2011 22:43:28 +0000 (08:13 +0930)]
tdb_compat: change offset of CLEAR_IF_FIRST lock.
This makes it match tdb1, which mean it will Just Work as TDB2 gets
tdb1 format support.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Wed Sep 14 02:21:29 CEST 2011 on sn-devel-104
Rusty Russell [Tue, 13 Sep 2011 22:43:28 +0000 (08:13 +0930)]
tdb_compat: support tdb_reopen/tdb_reopen_all for TDB2
This matters with the clear-if-first support: we need to re-establish
those locks at this point.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Tue, 13 Sep 2011 22:43:28 +0000 (08:13 +0930)]
util_tdb: return -1/0 from lock_with_timeout functions.
Keeps the tdb2 API change (which returns error codes, rather than -1)
localized. The function returns -1 down the other path, so make it
consistent.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Tue, 13 Sep 2011 22:43:28 +0000 (08:13 +0930)]
dbwrap_tdb: handle tdb2 return values properly.
TDB2 versions of tdb_parse_record etc return an error code, not -1.
Turn those into -1/0 in dbwrap_tdb to insulate the rest of the code
from that change.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Tue, 13 Sep 2011 22:43:28 +0000 (08:13 +0930)]
tdb2: fix prototypes which return enum TDB_ERROR.
Since enums and ints are compatible in C, the compiler didn't warn
that our prototypes for these functions disagreed with the
definitions.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
6d3832ee613adeb9ae7ed6454996ffa39c32650f)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: fix return handling in pytdb wrapper.
tdb_close() does genuinely return non-zero, not an error code, even in tdb2.
And tdb_exists() returns true or false, not an error code.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: add error conversion functions.
This clarifies the code a little, but also provides a more explicit
mechanism which can be used to debug error handling (by introducing
tdb_err_t and making it a pointer type).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
afa6d57b7d93fe4675a952f556eb462951baa257)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: set tdb_error() on tdb_transaction_prepare_commit.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
feb36b14278b4230af70dab90369a345b6a027ef)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: make tests work in parallel.
Lazy cut & paste of tdb names causes failure when we run in parallel.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
380372e733416c2b348d5307f536d0a0807e95df)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: fix error handling for tdb1_transaction_commit.
tdb_repack() returns an enum TDB_ERROR, whereas
tdb1_transaction_commit is expected to return 0 or -1.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
b679512e4260b9847e2f846b07443e6907d8276f)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: don't return -1 (ie. TDB_ERR_CORRUPT) on transaction write fail.
A left-over -1 return; should be returning ecode (probably TDB_ERR_IO).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
077bdae6877d26749987b26a1b5b28cdba5ebbdd)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: enhance tdb1 porting document.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
9cbae0f976118472f0065eee674eacf6ab4b80c5)
Rusty Russell [Tue, 13 Sep 2011 22:43:27 +0000 (08:13 +0930)]
tdb2: delete old tdb1 tests.
These two tdb1-specific tests have been superceded by the TDB_VERSION1
flags used in the main tests.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
e42097b73f6cd509aa17a48487a707401a2d4bd0)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: test: Speed up run-01-new_database.
Don't run tdb_check with failtest on, since it is very slow. Do the
tdb_check w/ failtest in a new test, but skip MMAP suppression which
doesn't add much and slows down valgrind a lot.
Before this change run-01-new_database took 40 seconds (under
valgrind), after it takes 8 seconds, and run-12-check takes 3
seconds).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
b3ae89992ecaffed31dcc2e912539c289478801a)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: speed up testing.
The time to run tests under valgrind has become excessive; particularly
the failure tests which fork(). Thus we cut down testing:
1) api-94-repack: reduce from 234 seconds to 2 seconds by cutting
iterations, despite adding TDB_VERSION1 tests.
2) api-missing-entries: reduce from 17 seconds to under 1 second by
not checking db inside loop, but at end.
This reduces the total ccanlint time from 729 to 489 seconds.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
a99c2ccf97465d47c3277d997ea93f20ff97ad4d)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: test: convert (non-invasive) run tests to api tests.
This reduces compilation time, since these are merely linked with the
pre-built module, rather than recompiling it into the test (which
allows for fancy things like failtest).
This reduces the test compile time down from about 62 seconds to 45
seconds. Since ccanlint compiles tests three times (once normally,
once with coverage, and once with reduced config.h) this makes a
difference: we go from 780 seconds to 729 seconds.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
c4ca9f54301c0367891be6330f59fdd5dcdd51d1)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: test: fix run-57-die-during-transaction.c to be more efficient.
We track malloc and free, but we didn't catch the free() inside
external_agent, which means that our list of allocations keeps
growing. Particularly under valgrind, which re-uses memory less than
the glibc allocator.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
d9cbd7d4454ae35e4e2f6d18a9469bf26948e4b9)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: don't continue if tdb1_find fails.
The TDB1 code's tdb1_find() returns 0 on error; the callers should
not assume that the error means that the entry wasn't found, but use
last_error to determine it.
This was found by looking at how long the failure path testing for
test/run-10-simple-store.c was taking under valgrind, ie:
valgrind -q ./run-10-simple-store --show-slowest
This change dropped the time for that test from 53 seconds to 19
seconds.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
1be090a2d749713cfd0c4584cafb97bffd716189)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: test: try (almost) all tests with TDB_VERSION1 flag.
There are some minor changes required, in particular:
1) Make sure lockcheck understands tdb1 allrecord lock upgrades.
2) Handle tdb1 sequence number jumps: various operations increment the
sequence number twice, especually tdb_append.
3) Don't test fail on unlock, since it gets triggered with traversal on the
tdb1 backend (we didn't actually ever test this case for tdb2).
4) Move clear_if_first to offset 4, to match tdb1.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
818ed29730b030ce79855fc35c212b51adff3180)
Rusty Russell [Tue, 13 Sep 2011 22:43:26 +0000 (08:13 +0930)]
tdb2: log allocation failures in tdb1 backend.
The TDB2 tests are stricter about this; they want every error logged.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
670ba98f74b52df541d153eeab9d3310932e75cd)
Rusty Russell [Tue, 13 Sep 2011 22:43:13 +0000 (08:13 +0930)]
tdb2: fix bogus error from tdb_unlockall() after fork in tdb1 backend.
We're always allowed to unlock after a fork; by setting the count to 0
before calling the generic unlock function we don't trigger the pid
check.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
ba5bb8eae6bcd230fd5321c618d6a9d56e74e7d1)
Rusty Russell [Tue, 13 Sep 2011 22:42:13 +0000 (08:12 +0930)]
tdb2: check lock owner in tdb1 backend.
This reports errors if we fork() while holding a lock, or misuse a tdb
which we have dual-opened.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
bef6f1b02e95370ecb2cb44be87c82afc9cb74b2)
Rusty Russell [Tue, 13 Sep 2011 22:41:13 +0000 (08:11 +0930)]
tdb2: return TDB_ERR_RDONLY from transactions on R/O databases, log nesting
Rather than rturning TDB_ERR_EINVAL, return TDB_ERR_RDONLY, and log
when we fail due to nesting.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
27647f94668040d91de377849dce87dabd72be69)
Rusty Russell [Tue, 13 Sep 2011 22:40:13 +0000 (08:10 +0930)]
tdb2: add stats to tdb1 backend.
It's actually quite a good fit; we use compare_wrong_bucket for dead
records, which is kind of correct (they should be in the free list).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
a3e4ebff2eb9dc2e386160b8acf77d70236f4def)
Rusty Russell [Tue, 13 Sep 2011 22:39:13 +0000 (08:09 +0930)]
tdb2: increment seqnum on tdb_wipe_all in tdb1 backend.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
79dee5018a407be1d0674d6108b60f8e8c882b7c)
Rusty Russell [Tue, 13 Sep 2011 22:38:13 +0000 (08:08 +0930)]
tdb2: log an error when calling tdb_store() on read-only TDB in tdb1 backend.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
b236a8dcc37bb864b632a2898a64f3c9bf75b4ac)
Rusty Russell [Tue, 13 Sep 2011 22:37:13 +0000 (08:07 +0930)]
tdb2: catch errors in tdb1_needs_recovery()
The tdb1 backend simply returns "true" if there's an error determining
if a tdb needs recovery. But this leads failtest down a rabbit hole;
it's better to return the error at this case (and makes for better for
diagnostics, since they will come from the first fault, not later in
tdb1_transaction_recover().
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
332d0c29baa6896e67c439aeb47f58a104fbc781)
Rusty Russell [Tue, 13 Sep 2011 22:36:13 +0000 (08:06 +0930)]
tdb2: add tdb_attribute_tdb1_max_dead
This allows us to simulate the old "volatile" flag for tdb1. It's not
necessary for tdb2.
As this is the last function in tdb1.h, we remove that file.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
b8e64e9346793164651a36eccb3c205077e5c91b)
Rusty Russell [Tue, 13 Sep 2011 22:35:13 +0000 (08:05 +0930)]
tdb2: expose and document tdb1_incompatible_hash.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
a4f2eb983b92b68bcad2a0d640924b8b456e3d69)
Rusty Russell [Tue, 13 Sep 2011 22:34:13 +0000 (08:04 +0930)]
tdb2: make tdb1_null static.
It's only used in two files, make it static in one and do it manually
in the other.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
8571daf007f03a2888566dbaae8a5849ffba60f3)
Rusty Russell [Tue, 13 Sep 2011 22:33:13 +0000 (08:03 +0930)]
tdb2: tdb_repack
Move the tdb1_repack() code into the core, make it general, rename to
tdb_repack().
It's generic code: copy database into temporary, wipe it, copy back.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
e487983a4099b6f760056ff7182f2ff543e6da71)
Rusty Russell [Tue, 13 Sep 2011 22:32:13 +0000 (08:02 +0930)]
tdb2: unify tdb1_wipe into tdb_wipe.
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
b2555a868e3ee58d1b31f9558e3623d49ed2b2f1)
Rusty Russell [Tue, 13 Sep 2011 22:31:13 +0000 (08:01 +0930)]
tdb2: unify tdb1_get_seqnum/tdb1_increment_seqnum into tdb_get_seqnum/tdb_inc_seqnum
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
57359c26e9626aa986ee0538efd13a44a466f39d)
Rusty Russell [Tue, 13 Sep 2011 22:30:13 +0000 (08:00 +0930)]
tdb2: unify tdb1_firstkey/tdb1_nextkey into tdb_firstkey/tdb_nextkey.
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
7366486e29e4f3d89a3e08fc114079d6441af850)
Rusty Russell [Tue, 13 Sep 2011 22:29:13 +0000 (07:59 +0930)]
tdb2: unify tdb1_check and tdb1_summary into tdb_check and tdb_summary.
Switch on the TDB_VERSION1 flag. Also, change tdb1_check's checkfn argument
to return an error code (and set tdb->last_error accordingly).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
ef92843f2c74ab9d4fa7f167a2182e5e8955df91)
Rusty Russell [Tue, 13 Sep 2011 22:28:13 +0000 (07:58 +0930)]
tdb2: unify tdb1_transaction_start etc. into tdb_transaction_start.
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
6bc8ea012391198bc3898ae2937558b60dd55906)
Rusty Russell [Tue, 13 Sep 2011 22:27:13 +0000 (07:57 +0930)]
tdb2: unify tdb1_parse_record into tdb_parse_record
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
3352e4e947777d4a90a2dd4f3037e1e494231b25)
Rusty Russell [Tue, 13 Sep 2011 22:26:13 +0000 (07:56 +0930)]
tdb2: unify tdb1_chainlock et al. into tdb_chainlock
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
ceb2f3eacbad917ee990afbc3dd800bfb0607887)
Rusty Russell [Tue, 13 Sep 2011 22:25:13 +0000 (07:55 +0930)]
tdb2: unify tdb1_traverse into tdb_traverse
Switch on the TDB_VERSION1 flag; we now only do a tdb1_traverse_read on a
read-only database, as there is no tdb2 equivalent.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
cc2d609dfca7192305ad477b8c2b52cfdc1aa9be)
Rusty Russell [Tue, 13 Sep 2011 22:24:13 +0000 (07:54 +0930)]
tdb2: unify tdb1_store into tdb_store
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
2bba2a856a6cfdb93085b701557850bc1da99587)
Rusty Russell [Tue, 13 Sep 2011 22:23:13 +0000 (07:53 +0930)]
tdb2: unify tdb1_delete into tdb_delete.
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
acb26c9c3ee054c8b2141db25c9bd7be064e425c)
Rusty Russell [Tue, 13 Sep 2011 22:22:13 +0000 (07:52 +0930)]
tdb2: unify tdb1_append into tdb_append
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
8bc38cb177928ef739440c32e33a8eaf23a5dd22)
Rusty Russell [Tue, 13 Sep 2011 22:21:13 +0000 (07:51 +0930)]
tdb2: unify tdb1_fetch into tdb_fetch
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
08c05da588018c6b76834e57b66d525546643708)
Rusty Russell [Tue, 13 Sep 2011 22:20:13 +0000 (07:50 +0930)]
tdb2: unify tdb1_store into tdb_store
Switch on the TDB_VERSION1 flag.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
98c754ffe65bc335f66161d6cc8705d4ea2710ec)
Rusty Russell [Tue, 13 Sep 2011 22:19:13 +0000 (07:49 +0930)]
tdb2: unify tdb1_open into tdb_open
Finally, we gut tdb1_open() to the tdb1-specific parts, and call it
from tdb_open if they specify the TDB_VERSION1 flag or the version is
a TDB1.
We also unify tdb_close(), based on the TDB_VERSION1 flag.
Note that tdb_open(TDB_VERSION1) will fail on an existing tdb if it's
a TDB2.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
c8c3b3568677e8b0105f84e4ab068c580faf4591)
Rusty Russell [Tue, 13 Sep 2011 22:18:13 +0000 (07:48 +0930)]
tdb2: disallow SEED attribute with TDB_VERSION1.
It also only makes sense with O_CREAT.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
fc44729c471bcdc7ab0410448d991a65e74cec3d)
Rusty Russell [Tue, 13 Sep 2011 22:17:13 +0000 (07:47 +0930)]
tdb2: add TDB_ATTRIBUTE_TDB1_HASHSIZE
This replaces the tdb1_open "hash_size" argument. It will only be
valid when you call tdb_open() with O_CREAT in open_flags, and
TDB_VERSION1 in tdb_flags.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
49475d68deecd0b31597ed6094229171d2699b11)
Rusty Russell [Tue, 13 Sep 2011 22:16:13 +0000 (07:46 +0930)]
tdb2: make tdb1_open use attributes for logging, hash function.
This brings it closer to tdb_open(), so we can unify more easily.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
a446f1d4d161d66bbb19ba2551cf6429a4865964)
Rusty Russell [Tue, 13 Sep 2011 22:15:13 +0000 (07:45 +0930)]
tdb2: make jenkins_hash function non-static, rename to tdb_jenkins_hash.
We're going to need access to it from tdb1_open, so expose it now.
It's better in hash.c anyway.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
c8f6f8c2dea76042f74c02eff048847e62adcca6)
Rusty Russell [Tue, 13 Sep 2011 22:14:13 +0000 (07:44 +0930)]
tdb2: remove double-open detection for TDB1 databases.
This is a percursor to unifying with tdb_open() from tdb2, which handles
this itself.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
97224cbbe29e76522ec38d031c54b1cadce8ae03)
Rusty Russell [Tue, 13 Sep 2011 22:13:13 +0000 (07:43 +0930)]
tdb2: merge tdb1_context into tdb_context.
Finally, we split out the tdb2-specific parts of tdb_context, and put
them into a "tdb2" sub-struct; the tdb1 parts go into a "tdb1"
sub-struct. We get rido of tdb1_context and use tdb_context
everywhere.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
bbeb528e74c0e234e1f724ac8d54be404cfc6f9a)
Rusty Russell [Tue, 13 Sep 2011 22:12:13 +0000 (07:42 +0930)]
tdb2: use tdb->flags & TDB_RDONLY instead of tdb->read_only for TDB1 code.
There's also a semantic change here: for tdb1, being read-only meant no
locking, and it was an error to try to lock a r/o database. For TDB2, you'd
need to specify TDB_NOLOCK, which suppresses locking silently.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
4dc29a338fadeac805b369b4b0851c02f1b152c7)
Rusty Russell [Tue, 13 Sep 2011 22:11:13 +0000 (07:41 +0930)]
tdb2: Make TDB1 use the same tdb_hash() wrapper as TDB2
This means converting the tdb1 inbuilt hash functions to the
tdb2-style, so they return 64 bit. We truncate to 32 bit everywhere
but in tdb_check() which needs to do so explicitly.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
3e46dde21261966941469a6c75e1b45cd2d26324)
Rusty Russell [Tue, 13 Sep 2011 22:10:13 +0000 (07:40 +0930)]
tdb2: don't cancel transactions on lock failures in tdb1 backend.
In TDB2, the user can override locking functions, so they may
deliberarely fail (eg. be non-blocking) expecting to retry.
For this reason, the TDB2 API requires the caller to cancel the
transaction if tdb_transaction_prepare_commit() fails.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
8458811a4126c22635b974718bfbf2876c893c37)
Rusty Russell [Tue, 13 Sep 2011 22:09:13 +0000 (07:39 +0930)]
tdb2: suppress tdb1 backend logging when locking returns EINTR or EAGAIN
The TDB1 code logs multiple times on errors; we must prevent that in
the limited case where locking fails. With TDB2, this can happen due
to the lock function attribute, where the user supplies replacement
locking functions which are allowed to return with errno EAGAIN or
EINTR for various special-effects. Flooding the logs for this is
unfriendly.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
a391b2b900bc6d5c0467869a454bdb5c51b5a3be)
Rusty Russell [Tue, 13 Sep 2011 22:08:13 +0000 (07:38 +0930)]
tdb2: make tdb1 use same low-level lock functions.
This means they will use the TDB_ATTRIBUTE_FLOCK functions, and get automatic
reopen support.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit
fbad02b680b6cbc33ae305ae1cbcdead4eedc7b1)