summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-09-15Finish commit 8745c70d by Michael Adam.Jeremy Allison2-9/+9
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
2011-09-14s3:libsmb: remove unused cli->is_sambaStefan Metzmacher3-31/+1
s3:libsmb: remove unused cli->is_samba metze Signed-off-by: Jeremy Allison <jra@samba.org>
2011-09-14s3:libsmb: align chunk_size for cli_pull/push() to a page size of 1024 bytesStefan Metzmacher1-0/+8
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>
2011-09-14s3:client.h: remove unused definesStefan Metzmacher1-9/+0
s3:client.h: remove unused defines metze Signed-off-by: Jeremy Allison <jra@samba.org>
2011-09-14s3:libsmb: let cli_write_max_bufsize() return the max number of possible bytesStefan Metzmacher1-21/+28
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>
2011-09-14s3:libsmb: let cli_read_max_bufsize() return the max number of possible bytesStefan Metzmacher1-16/+31
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>
2011-09-14s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients.Stefan Metzmacher1-1/+10
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>
2011-09-14s3:smbd: remember the client unix capabilities on the connectionStefan Metzmacher2-43/+44
metze Signed-off-by: Jeremy Allison <jra@samba.org>
2011-09-14Fix bug #8453 - smbclient segfaults when dialect option -m is used for ↵Jeremy Allison1-0/+13
legacy dialects Ensure we have valid pointers.
2011-09-14libcli/auth: add some const to SMBNTencrypt_hash() and SMBNTencrypt()Stefan Metzmacher2-4/+4
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Wed Sep 14 19:49:24 CEST 2011 on sn-devel-104
2011-09-14s4:wrepl_server: return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-1/+1
We should return the same in all places. metze
2011-09-14s4:libcli/wrepl: return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-3/+3
We should return the same in all places. metze
2011-09-14s4:lib/messaging: let irpc handles return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-2/+2
We should return the same in all places. metze
2011-09-14s4:librpc/rpc: return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-2/+2
We should return the same in all places. metze
2011-09-14s3:winbindd: let wbint handles return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-2/+2
We should return the same in all places. metze
2011-09-14s3:rpc_server: let rpcint handles return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher1-2/+2
We should return the same in all places. metze
2011-09-14s3:rpc_client: return NT_STATUS_CONNECTION_DISCONNECTEDStefan Metzmacher2-5/+5
We should return the same in all places and don't mix NT_STATUS_INVALID_CONNECTION and NT_STATUS_CONNECTION_INVALID. metze
2011-09-14s3:libsmb: return NT_STATUS_CONNECTION_DISCONNECTED instead of ↵Stefan Metzmacher1-1/+1
NT_STATUS_CONNECTION_INVALID We should return the same in all places. metze
2011-09-14s3:torture/run_oplock4: don't set cli->use_level_II_oplocksStefan Metzmacher1-3/+0
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
2011-09-14s3:smb2_server: SMB2_OP_GETINFO doesn't require at least 1 dyn byteStefan Metzmacher1-1/+13
metze
2011-09-14s3-libnet: add missing newlines in debug statement.Günther Deschner1-2/+2
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Sep 14 15:52:10 CEST 2011 on sn-devel-104
2011-09-14s3:smbd: make use of better SMB signing negotiationStefan Metzmacher4-4/+31
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Wed Sep 14 09:41:02 CEST 2011 on sn-devel-104
2011-09-14s3:libsmb: make use of new advanded SMB signingStefan Metzmacher4-57/+64
metze
2011-09-14s3:smb_signing: add support for easier negotiation of SMB signingStefan Metzmacher5-37/+83
We don't make use of it yet, but it will follow. metze
2011-09-14s3:smbd: echo FLAGS2_SMB_SECURITY_SIGNATURES* and the signature field in the ↵Stefan Metzmacher1-3/+9
reply This matches what windows is doing. metze
2011-09-14tdb2: remove bogus leftover .orig file.Rusty Russell1-618/+0
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
2011-09-14Fix bug #8229 - git patch attached against 3.6.0-rc2 to fix 'widelinks' ↵Jeremy Allison5-1/+67
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
2011-09-14tdb_compat: change offset of CLEAR_IF_FIRST lock.Rusty Russell1-2/+2
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
2011-09-14tdb_compat: support tdb_reopen/tdb_reopen_all for TDB2Rusty Russell2-3/+49
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>
2011-09-14util_tdb: return -1/0 from lock_with_timeout functions.Rusty Russell1-2/+2
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>
2011-09-14dbwrap_tdb: handle tdb2 return values properly.Rusty Russell1-4/+4
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>
2011-09-14tdb2: fix prototypes which return enum TDB_ERROR.Rusty Russell2-10/+10
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)
2011-09-14tdb2: fix return handling in pytdb wrapper.Rusty Russell1-8/+10
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>
2011-09-14tdb2: add error conversion functions.Rusty Russell12-91/+97
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)
2011-09-14tdb2: set tdb_error() on tdb_transaction_prepare_commit.Rusty Russell1-1/+1
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit feb36b14278b4230af70dab90369a345b6a027ef)
2011-09-14tdb2: make tests work in parallel.Rusty Russell6-6/+6
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)
2011-09-14tdb2: fix error handling for tdb1_transaction_commit.Rusty Russell1-1/+2
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)
2011-09-14tdb2: don't return -1 (ie. TDB_ERR_CORRUPT) on transaction write fail.Rusty Russell1-1/+1
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)
2011-09-14tdb2: enhance tdb1 porting document.Rusty Russell1-0/+28
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit 9cbae0f976118472f0065eee674eacf6ab4b80c5)
2011-09-14tdb2: delete old tdb1 tests.Rusty Russell2-394/+0
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)
2011-09-14tdb2: test: Speed up run-01-new_database.Rusty Russell2-7/+78
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)
2011-09-14tdb2: speed up testing.Rusty Russell2-5/+7
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)
2011-09-14tdb2: test: convert (non-invasive) run tests to api tests.Rusty Russell23-23/+115
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)
2011-09-14tdb2: test: fix run-57-die-during-transaction.c to be more efficient.Rusty Russell3-3/+18
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)
2011-09-14tdb2: don't continue if tdb1_find fails.Rusty Russell1-16/+37
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)
2011-09-14tdb2: test: try (almost) all tests with TDB_VERSION1 flag.Rusty Russell33-128/+364
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)
2011-09-14tdb2: log allocation failures in tdb1 backend.Rusty Russell4-12/+30
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)
2011-09-14tdb2: fix bogus error from tdb_unlockall() after fork in tdb1 backend.Rusty Russell1-3/+3
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)
2011-09-14tdb2: check lock owner in tdb1 backend.Rusty Russell3-27/+88
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)
2011-09-14tdb2: return TDB_ERR_RDONLY from transactions on R/O databases, log nestingRusty Russell2-8/+25
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)