From: Ralph Boehme Date: Fri, 28 Dec 2018 11:16:27 +0000 (+0100) Subject: s3:smbd: pass (raw) ev to dos_mode_at_send() instead of smb_vfs_ev_glue X-Git-Tag: talloc-2.1.15~200 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=9f3d9ba49b015e9958c5995e18300b396cadaf81 s3:smbd: pass (raw) ev to dos_mode_at_send() instead of smb_vfs_ev_glue Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 52781ca5ab3..177fe68c894 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -761,11 +761,10 @@ struct dos_mode_at_state { 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 smb_vfs_ev_glue *evg, + struct tevent_context *ev, files_struct *dir_fsp, struct smb_filename *smb_fname) { - struct tevent_context *ev = dir_fsp->conn->sconn->raw_ev_ctx; struct tevent_req *req = NULL; struct dos_mode_at_state *state = NULL; struct tevent_req *subreq = NULL; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index a74a79f7569..2a56c1e4346 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -264,7 +264,7 @@ uint32_t dos_mode_msdfs(connection_struct *conn, const 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 smb_vfs_ev_glue *evg, + struct tevent_context *ev, files_struct *dir_fsp, struct smb_filename *smb_fname); NTSTATUS dos_mode_at_recv(struct tevent_req *req, uint32_t *dosmode); diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c index 654e21decc8..48a818dfe9c 100644 --- a/source3/smbd/smb2_query_directory.c +++ b/source3/smbd/smb2_query_directory.c @@ -970,7 +970,7 @@ static struct tevent_req *fetch_dos_mode_send( uint32_t info_level, 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 fetch_dos_mode_state *state = 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); - 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)) { return tevent_req_post(req, ev); }