sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

libsmb: Add "flags" to cli_smb2_close_fnum_send()

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15487

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2023-10-07 12:06:26 +02:00
parent d1846452e9
commit f72ef19cf5
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/fuse/clifuse.c
View File

@ -952,7 +952,7 @@ static void cli_ll_release(fuse_req_t freq, fuse_ino_t ino,
fnum = fi->fh; fnum = fi->fh;
req = cli_smb2_close_fnum_send(state, mstate->ev, mstate->cli, fnum); req = cli_smb2_close_fnum_send(state, mstate->ev, mstate->cli, fnum, 0);
if (req == NULL) { if (req == NULL) {
TALLOC_FREE(state); TALLOC_FREE(state);
fuse_reply_err(freq, ENOMEM); fuse_reply_err(freq, ENOMEM);

56
source3/libsmb/cli_smb2_fnum.c
View File

@ -463,7 +463,8 @@ static void cli_smb2_close_fnum_done(struct tevent_req *subreq);
struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx, struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev, struct tevent_context *ev,
struct cli_state *cli, struct cli_state *cli,
uint16_t fnum) uint16_t fnum,
uint16_t flags)
{ {
struct tevent_req *req, *subreq; struct tevent_req *req, *subreq;
struct cli_smb2_close_fnum_state *state; struct cli_smb2_close_fnum_state *state;
@ -482,9 +483,14 @@ struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
} }
subreq = smb2cli_close_send(state, ev, cli->conn, cli->timeout, subreq = smb2cli_close_send(state,
cli->smb2.session, cli->smb2.tcon, ev,
0, state->ph->fid_persistent, cli->conn,
cli->timeout,
cli->smb2.session,
cli->smb2.tcon,
flags,
state->ph->fid_persistent,
state->ph->fid_volatile); state->ph->fid_volatile);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
@ -546,7 +552,7 @@ NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum)
if (ev == NULL) { if (ev == NULL) {
goto fail; goto fail;
} }
req = cli_smb2_close_fnum_send(frame, ev, cli, fnum); req = cli_smb2_close_fnum_send(frame, ev, cli, fnum, 0);
if (req == NULL) { if (req == NULL) {
goto fail; goto fail;
} }
@ -843,7 +849,8 @@ static void cli_smb2_mkdir_opened(struct tevent_req *subreq)
return; return;
} }
subreq = cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum); subreq =
cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum, 0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -1004,8 +1011,11 @@ static void cli_smb2_rmdir_disp_set(struct tevent_req *subreq)
* Close the fd even if the set_disp failed * Close the fd even if the set_disp failed
*/ */
subreq = cli_smb2_close_fnum_send( subreq = cli_smb2_close_fnum_send(state,
state, state->ev, state->cli, state->fnum); state->ev,
state->cli,
state->fnum,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -1134,7 +1144,8 @@ static void cli_smb2_unlink_opened1(struct tevent_req *subreq)
return; return;
} }
subreq = cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum); subreq =
cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum, 0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -1157,7 +1168,8 @@ static void cli_smb2_unlink_opened2(struct tevent_req *subreq)
return; return;
} }
subreq = cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum); subreq =
cli_smb2_close_fnum_send(state, state->ev, state->cli, fnum, 0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -1541,8 +1553,11 @@ static void cli_smb2_list_done(struct tevent_req *subreq)
TALLOC_FREE(response); TALLOC_FREE(response);
subreq = cli_smb2_close_fnum_send( subreq = cli_smb2_close_fnum_send(state,
state, state->ev, state->cli, state->fnum); state->ev,
state->cli,
state->fnum,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -2345,7 +2360,8 @@ static void cli_smb2_qpathinfo_done(struct tevent_req *subreq)
subreq = cli_smb2_close_fnum_send(state, subreq = cli_smb2_close_fnum_send(state,
state->ev, state->ev,
state->cli, state->cli,
state->fnum); state->fnum,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -3027,8 +3043,11 @@ static void cli_smb2_mxac_opened(struct tevent_req *subreq)
state->mxac = IVAL(mxac_blob->data.data, 4); state->mxac = IVAL(mxac_blob->data.data, 4);
close: close:
subreq = cli_smb2_close_fnum_send( subreq = cli_smb2_close_fnum_send(state,
state, state->ev, state->cli, state->fnum); state->ev,
state->cli,
state->fnum,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -3333,8 +3352,11 @@ static void cli_smb2_rename_renamed(struct tevent_req *subreq)
state->rename_status = cli_smb2_rename_fnum_recv(subreq); state->rename_status = cli_smb2_rename_fnum_recv(subreq);
TALLOC_FREE(subreq); TALLOC_FREE(subreq);
subreq = cli_smb2_close_fnum_send( subreq = cli_smb2_close_fnum_send(state,
state, state->ev, state->cli, state->fnum); state->ev,
state->cli,
state->fnum,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }

3
source3/libsmb/cli_smb2_fnum.h
View File

@ -70,7 +70,8 @@ NTSTATUS cli_smb2_create_fnum(
struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx, struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev, struct tevent_context *ev,
struct cli_state *cli, struct cli_state *cli,
uint16_t fnum); uint16_t fnum,
uint16_t flags);
NTSTATUS cli_smb2_close_fnum_recv(struct tevent_req *req); NTSTATUS cli_smb2_close_fnum_recv(struct tevent_req *req);
NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum); NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum);
struct tevent_req *cli_smb2_delete_on_close_send(TALLOC_CTX *mem_ctx, struct tevent_req *cli_smb2_delete_on_close_send(TALLOC_CTX *mem_ctx,

12
source3/libsmb/clifile.c
View File

@ -2048,8 +2048,11 @@ static void cli_smb2_hardlink_info_set(struct tevent_req *subreq)
/* ignore error here, we need to close the file */ /* ignore error here, we need to close the file */
subreq = cli_smb2_close_fnum_send( subreq = cli_smb2_close_fnum_send(state,
state, state->ev, state->cli, state->fnum_src); state->ev,
state->cli,
state->fnum_src,
0);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return; return;
} }
@ -3648,10 +3651,7 @@ struct tevent_req *cli_close_send(TALLOC_CTX *mem_ctx,
} }
if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) { if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
subreq = cli_smb2_close_fnum_send(state, subreq = cli_smb2_close_fnum_send(state, ev, cli, fnum, 0);
ev,
cli,
fnum);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
} }