s3:smbd: pass (raw) ev to dos_mode_at_send() instead of smb_vfs_ev_glue
authorRalph Boehme <slow@samba.org>
Fri, 28 Dec 2018 11:16:27 +0000 (12:16 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 11 Jan 2019 22:11:11 +0000 (23:11 +0100)
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/dosmode.c
source3/smbd/proto.h
source3/smbd/smb2_query_directory.c

index 52781ca..177fe68 100644 (file)
@@ -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;
index a74a79f..2a56c1e 100644 (file)
@@ -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);
index 654e21d..48a818d 100644 (file)
@@ -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);
        }