diff options
| author | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:13:45 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:18:00 +0200 |
| commit | fcc634b483255bedf53f3aea40334c018e13dcce (patch) | |
| tree | 7d59833bd515e295e70ec188e1aa2b1436b3355c /source3/client/client.c | |
| parent | 97d7291d12e803076022d71556c792b0cd4e60e8 (diff) | |
| parent | 80a1dfddf9086700a8de5fd6005a9179b0bb3d9e (diff) | |
| download | samba-fcc634b483255bedf53f3aea40334c018e13dcce.tar.gz | |
Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/client/client.c')
| -rw-r--r-- | source3/client/client.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |