diff options
| author | Jeremy Allison <jra@samba.org> | 2014-05-08 20:55:57 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-05-09 23:10:07 +0200 |
| commit | 69e24b4e8bc607806453ab137efda6d6bf74fb12 (patch) | |
| tree | 3eb182e140ac2b5279d6310e44274efecf2e9290 /source3/utils | |
| parent | 2900dfa5b928ef237e72ac4e15481e083d61750a (diff) | |
| download | samba-69e24b4e8bc607806453ab137efda6d6bf74fb12.tar.gz samba-69e24b4e8bc607806453ab137efda6d6bf74fb12.tar.xz samba-69e24b4e8bc607806453ab137efda6d6bf74fb12.zip | |
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 <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 3 | ||||
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 7 | ||||
| -rw-r--r-- | source3/utils/smbcacls.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 778e888950e..b5c4d0b2e93 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -5104,7 +5104,8 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd, } if (!NT_STATUS_IS_OK(cli_ntcreate(cli, "\\", 0, READ_CONTROL_ACCESS, 0, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum))) { + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN, 0x0, 0x0, &fnum, NULL))) { cli_query_secdesc(cli, fnum, mem_ctx, &root_sd); } diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 7ff838675ed..3cdac6223fb 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -177,7 +177,7 @@ NTSTATUS net_copy_fileattr(struct net_context *c, nt_status = cli_ntcreate(cli_share_src, src_name, 0, READ_CONTROL_ACCESS, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, - 0x0, 0x0, &fnum_src); + 0x0, 0x0, &fnum_src, NULL); if (!NT_STATUS_IS_OK(nt_status)) { DEBUGADD(0,("cannot open %s %s on originating server %s\n", is_file?"file":"dir", src_name, nt_errstr(nt_status))); @@ -214,7 +214,7 @@ NTSTATUS net_copy_fileattr(struct net_context *c, nt_status = cli_ntcreate(cli_share_dst, dst_name, 0, WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, - 0x0, 0x0, &fnum_dst); + 0x0, 0x0, &fnum_dst, NULL); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0,("failed to open %s on the destination server: %s: %s\n", is_file?"file":"dir", dst_name, nt_errstr(nt_status))); @@ -331,7 +331,8 @@ NTSTATUS net_copy_file(struct net_context *c, nt_status = cli_open(cli_share_src, src_name, O_RDONLY, DENY_NONE, &fnum_src); else nt_status = cli_ntcreate(cli_share_src, src_name, 0, READ_CONTROL_ACCESS, 0, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0x0, 0x0, &fnum_src); + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN, 0x0, 0x0, &fnum_src, NULL); if (!NT_STATUS_IS_OK(nt_status)) { DEBUGADD(0,("cannot open %s %s on originating server %s\n", diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 8d3071cc956..684fe791da1 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -810,7 +810,7 @@ static uint16 get_fileinfo(struct cli_state *cli, const char *filename) status = cli_ntcreate(cli, filename, 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)) { printf("Failed to open %s: %s\n", filename, nt_errstr(status)); return 0; @@ -858,7 +858,7 @@ static struct security_descriptor *get_secdesc(struct cli_state *cli, const char status = cli_ntcreate(cli, filename, 0, desired_access, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, 0x0, 0x0, &fnum); + FILE_OPEN, 0x0, 0x0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to open %s: %s\n", filename, nt_errstr(status)); return NULL; @@ -922,7 +922,7 @@ static bool set_secdesc(struct cli_state *cli, const char *filename, status = cli_ntcreate(cli, filename, 0, desired_access, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, 0x0, 0x0, &fnum); + FILE_OPEN, 0x0, 0x0, &fnum, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to open %s: %s\n", filename, nt_errstr(status)); return false; |