From 569a4e10d9e063f79ed51a4381df80c19904d9bd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 May 2014 20:55:57 -0700 Subject: s3: client : Add extra return parameter to all client open calls. Add a return parameter of struct smb_create_returns *cr to cli_ntcreate() cli_ntcreate_recv() cli_nttrans_create() cli_nttrans_create_recv() Always pass in NULL for now. This fixes the create API to always fully return the data the server has given back to us on the open file to the caller. Signed-off-by: Jeremy Allison Reviewed-by: Stefan Metzmacher (cherry picked from commit 69e24b4e8bc607806453ab137efda6d6bf74fb12) --- source3/client/client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/client/client.c') diff --git a/source3/client/client.c b/source3/client/client.c index 9d5cec90b1e..ab46cb80a9a 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -579,7 +579,7 @@ static NTSTATUS display_finfo(struct cli_state *cli_state, struct file_info *fin status = cli_ntcreate(cli_state, afname, 0, CREATE_ACCESS_READ, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, 0x0, 0x0, &fnum); + FILE_OPEN, 0x0, 0x0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { DEBUG( 0, ("display_finfo() Failed to open %s: %s\n", afname, nt_errstr(status))); @@ -1778,7 +1778,7 @@ static int do_allinfo(const char *name) SEC_STD_SYNCHRONIZE, 0, FILE_SHARE_READ|FILE_SHARE_WRITE |FILE_SHARE_DELETE, - FILE_OPEN, 0x0, 0x0, &fnum); + FILE_OPEN, 0x0, 0x0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { /* * Ignore failure, it does not hurt if we can't list @@ -2502,12 +2502,12 @@ static int cmd_open(void) status = cli_ntcreate(targetcli, targetname, 0, FILE_READ_DATA|FILE_WRITE_DATA, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, - 0x0, 0x0, &fnum); + 0x0, 0x0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { status = cli_ntcreate(targetcli, targetname, 0, FILE_READ_DATA, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, - 0x0, 0x0, &fnum); + 0x0, 0x0, &fnum, NULL); if (NT_STATUS_IS_OK(status)) { d_printf("open file %s: for read/write fnum %d\n", targetname, fnum); } else { @@ -3949,7 +3949,7 @@ static int cmd_notify(void) status = cli_ntcreate( cli, name, 0, FILE_READ_DATA, 0, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_OPEN, 0, 0, &fnum); + FILE_OPEN, 0, 0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { d_printf("Could not open file: %s\n", nt_errstr(status)); goto fail; -- cgit v1.2.1