sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s3:smbd: pass (raw) ev to dos_mode_at_send() instead of smb_vfs_ev_glue

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2018-12-28 12:16:27 +01:00 committed by Stefan Metzmacher
parent 56dee840e4
commit 9f3d9ba49b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/smbd/dosmode.c
View File

@ -761,11 +761,10 @@ struct dos_mode_at_state {
static void dos_mode_at_vfs_get_dosmode_done(struct tevent_req *subreq); static void dos_mode_at_vfs_get_dosmode_done(struct tevent_req *subreq);
struct tevent_req *dos_mode_at_send(TALLOC_CTX *mem_ctx, struct tevent_req *dos_mode_at_send(TALLOC_CTX *mem_ctx,
struct smb_vfs_ev_glue *evg, struct tevent_context *ev,
files_struct *dir_fsp, files_struct *dir_fsp,
struct smb_filename *smb_fname) struct smb_filename *smb_fname)
{ {
struct tevent_context *ev = dir_fsp->conn->sconn->raw_ev_ctx;
struct tevent_req *req = NULL; struct tevent_req *req = NULL;
struct dos_mode_at_state *state = NULL; struct dos_mode_at_state *state = NULL;
struct tevent_req *subreq = NULL; struct tevent_req *subreq = NULL;

2
source3/smbd/proto.h
View File

@ -264,7 +264,7 @@ uint32_t dos_mode_msdfs(connection_struct *conn,
const struct smb_filename *smb_fname); const struct smb_filename *smb_fname);
uint32_t dos_mode(connection_struct *conn, struct smb_filename *smb_fname); uint32_t dos_mode(connection_struct *conn, struct smb_filename *smb_fname);
struct tevent_req *dos_mode_at_send(TALLOC_CTX *mem_ctx, struct tevent_req *dos_mode_at_send(TALLOC_CTX *mem_ctx,
struct smb_vfs_ev_glue *evg, struct tevent_context *ev,
files_struct *dir_fsp, files_struct *dir_fsp,
struct smb_filename *smb_fname); struct smb_filename *smb_fname);
NTSTATUS dos_mode_at_recv(struct tevent_req *req, uint32_t *dosmode); NTSTATUS dos_mode_at_recv(struct tevent_req *req, uint32_t *dosmode);

4
source3/smbd/smb2_query_directory.c
View File

@ -970,7 +970,7 @@ static struct tevent_req *fetch_dos_mode_send(
uint32_t info_level, uint32_t info_level,
uint8_t *entry_marshall_buf) uint8_t *entry_marshall_buf)
{ {
struct tevent_context *ev = smb_vfs_ev_glue_ev_ctx(evg); struct tevent_context *ev = dir_fsp->conn->sconn->raw_ev_ctx;
struct tevent_req *req = NULL; struct tevent_req *req = NULL;
struct fetch_dos_mode_state *state = NULL; struct fetch_dos_mode_state *state = NULL;
struct tevent_req *subreq = NULL; struct tevent_req *subreq = NULL;
@ -987,7 +987,7 @@ static struct tevent_req *fetch_dos_mode_send(
state->smb_fname = talloc_move(state, smb_fname); state->smb_fname = talloc_move(state, smb_fname);
subreq = dos_mode_at_send(state, evg, dir_fsp, state->smb_fname); subreq = dos_mode_at_send(state, ev, dir_fsp, state->smb_fname);
if (tevent_req_nomem(subreq, req)) { if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev); return tevent_req_post(req, ev);
} }