summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2013-03-19 09:03:38 +0100
committerJeremy Allison <jra@samba.org>2013-03-20 09:32:25 -0700
commitb041dc9451e210acc82a82b75e02e4166d8973d5 (patch)
tree2f128b6569338e76507a576605f79db56aca623b
parent3d7a4db6bc5cd42432393bf69622c435e67e811f (diff)
downloadsamba-b041dc9451e210acc82a82b75e02e4166d8973d5.tar.gz
samba-b041dc9451e210acc82a82b75e02e4166d8973d5.tar.bz2
samba-b041dc9451e210acc82a82b75e02e4166d8973d5.zip
s3:libsmb: make use of SMB_CAP_LEGACY_CLIENT_MASK instead of SMB_CAP_CLIENT_MASK
This should allow smbclient to keep using large reads against older Samba versions (<= 3.6.x) and other servers that may also require this. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/libsmb/cliconnect.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 52d8e0cf8c..872900c6f3 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -341,9 +341,13 @@ static uint32_t cli_session_setup_capabilities(struct cli_state *cli,
* - client only flags
* - flags used in both directions
*
- * We do not echo the server only flags.
+ * We do not echo the server only flags, except some legacy flags.
+ *
+ * SMB_CAP_LEGACY_CLIENT_MASK contains CAP_LARGE_READX and
+ * CAP_LARGE_WRITEX in order to allow us to do large reads
+ * against old Samba releases (<= 3.6.x).
*/
- client_capabilities &= (SMB_CAP_BOTH_MASK | SMB_CAP_CLIENT_MASK);
+ client_capabilities &= (SMB_CAP_BOTH_MASK | SMB_CAP_LEGACY_CLIENT_MASK);
/*
* Session Setup specific flags CAP_DYNAMIC_REAUTH