The branch, master has been updated via 9881712 s3: Further fix for bug 8338 via 37b9753 Fix some typos via cb2fe8b s3: Fix typos from 02a08d5 s4:ntvfs common - remove two outdated function prototypes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9881712a09b2579047dcca6c22f9e919029455d4 Author: Volker Lendecke <v...@samba.org> Date: Tue Sep 20 22:45:52 2011 +0200 s3: Further fix for bug 8338 OS/X can not deal with a 10-vwv read on normal files. Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Wed Sep 21 00:51:08 CEST 2011 on sn-devel-104 commit 37b9753096f20087bf3bf9f8454b99302eebdfd2 Author: Volker Lendecke <v...@samba.org> Date: Mon Sep 19 01:41:27 2011 +0200 Fix some typos commit cb2fe8bafc738acdec35d4061a94c9767847e9ae Author: Volker Lendecke <v...@samba.org> Date: Mon Sep 19 00:02:55 2011 +0200 s3: Fix typos ----------------------------------------------------------------------- Summary of changes: docs-xml/smbdotconf/misc/rpcserver.xml | 11 ++++------- source3/libsmb/clireadwrite.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml b/docs-xml/smbdotconf/misc/rpcserver.xml index 6984668..fcc63fe 100644 --- a/docs-xml/smbdotconf/misc/rpcserver.xml +++ b/docs-xml/smbdotconf/misc/rpcserver.xml @@ -15,7 +15,7 @@ <para> This option can be set for each available rpc service in Samba. The following list shows all available pipe names services you - can modify with this options. + can modify with this option. </para> <itemizedlist> @@ -50,19 +50,16 @@ <para> Choosing the <emphasis>external</emphasis> option allows to run - separate daemon or even a completely independent (3rd party) + a separate daemon or even a completely independent (3rd party) server capable of interfacing with samba via the MS-RPC interface over named pipes. </para> <para> - Currently in Samba3 we support thre daemons, spoolssd, epmd and + Currently in Samba3 we support three daemons, spoolssd, epmd and lsasd. These daemons can be enabled using the <emphasis>rpc_daemon</emphasis> option. For spoolssd you have - to to enable the deamon and proxy the named pipe with: - Currently in Samba3 we support thre daemons, spoolssd, epmd and - lsasd. These daemons can be enabled using the - <emphasis>rpc_daemon</emphasis> option. + to to enable the daemon and proxy the named pipe with: </para> <para> diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 1ee2196..e8c9017 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -155,10 +155,17 @@ struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, SSVAL(state->vwv + 8, 0, 0); SSVAL(state->vwv + 9, 0, 0); - if ((uint64_t)offset >> 32) { + if (cli_state_capabilities(cli) & CAP_LARGE_FILES) { SIVAL(state->vwv + 10, 0, (((uint64_t)offset)>>32) & 0xffffffff); - wct += 2; + wct = 12; + } else { + if ((((uint64_t)offset) & 0xffffffff00000000LL) != 0) { + DEBUG(10, ("cli_read_andx_send got large offset where " + "the server does not support it\n")); + tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); + return tevent_req_post(req, ev); + } } subreq = cli_smb_req_create(state, ev, cli, SMBreadX, 0, wct, -- Samba Shared Repository