Revert "source3/smbd"

[metze/samba/wip.git] / source3 / smbd / smb2_find.c

diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c
index 1854f3457db03302a39a01e2c7637f2cefb965e8..9c0d18b278fa7033e6ba33cf901742f85dab729b 100644 (file)
--- a/source3/smbd/smb2_find.c
+++ b/source3/smbd/smb2_find.c
@@ -31,7 +31,6 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                                              uint8_t in_file_info_class,
                                              uint8_t in_flags,
                                              uint32_t in_file_index,
-                                             uint64_t in_file_id_persistent,
                                              uint64_t in_file_id_volatile,
                                              uint32_t in_output_buffer_length,
                                              const char *in_file_name);
@@ -116,13 +115,18 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req)
                return smbd_smb2_request_error(req, NT_STATUS_OBJECT_NAME_INVALID);
        }
 
+       if (req->compat_chain_fsp) {
+               /* skip check */
+       } else if (in_file_id_persistent != in_file_id_volatile) {
+               return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
+       }
+
        subreq = smbd_smb2_find_send(req,
                                     req->sconn->ev_ctx,
                                     req,
                                     in_file_info_class,
                                     in_flags,
                                     in_file_index,
-                                    in_file_id_persistent,
                                     in_file_id_volatile,
                                     in_output_buffer_length,
                                     in_file_name_string);
@@ -202,7 +206,6 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                                              uint8_t in_file_info_class,
                                              uint8_t in_flags,
                                              uint32_t in_file_index,
-                                             uint64_t in_file_id_persistent,
                                              uint64_t in_file_id_volatile,
                                              uint32_t in_output_buffer_length,
                                              const char *in_file_name)
@@ -247,12 +250,6 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
                return tevent_req_post(req, ev);
        }
-       if (smb2req->compat_chain_fsp) {
-               /* skip check */
-       } else if (in_file_id_persistent != fsp->smbXsrv->global->open_persistent_id) {
-               tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
-               return tevent_req_post(req, ev);
-       }
        if (conn != fsp->conn) {
                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
                return tevent_req_post(req, ev);