Revert "HACK FSCTL_LMR_REQ_RESILIENCY..."

This reverts commit 1c3fb11f555be90143e9c357e28c8e98debe3ea9.

diff --git a/source3/librpc/idl/smbXsrv.idl b/source3/librpc/idl/smbXsrv.idl
index d03ed445d2ebdb9cad6266c48f10ee7ccd291817..c7acdff3b4e06b13cdcab69b7f559aadce134f2b 100644 (file)
--- a/source3/librpc/idl/smbXsrv.idl
+++ b/source3/librpc/idl/smbXsrv.idl
@@ -435,7 +435,6 @@ interface smbXsrv
                DATA_BLOB                               backend_cookie;
                uint16                                  channel_sequence;
                hyper                                   channel_generation;
-               boolean8                                is_resilient; //TODO
                [flag(NDR_PAHEX)] uint8                 lock_sequence_array[64];
        } smbXsrv_open_global0;
 

diff --git a/source3/smbd/smb2_ioctl_network_fs.c b/source3/smbd/smb2_ioctl_network_fs.c
index 8e10d71f864a0bec8279bc9c028679438203b940..8154fa3f92ed2ea7986bdf0642b1422743b2724a 100644 (file)
--- a/source3/smbd/smb2_ioctl_network_fs.c
+++ b/source3/smbd/smb2_ioctl_network_fs.c
@@ -511,42 +511,6 @@ static NTSTATUS fsctl_validate_neg_info(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-static NTSTATUS fsctl_network_resiliency(TALLOC_CTX *mem_ctx,
-                                        struct tevent_context *ev,
-                                        struct files_struct *in_fsp,
-                                        DATA_BLOB *in_input,
-                                        uint32_t in_max_output,
-                                        DATA_BLOB *out_output)
-{
-       NTSTATUS status;
-       uint32_t in_timeout;
-
-       *out_output = data_blob_null;
-
-       if (in_fsp == NULL) {
-               return NT_STATUS_FILE_CLOSED;
-       }
-
-       if (in_input->length < 8) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       in_timeout = IVAL(in_input->data, 0);
-       if (in_timeout > 300000) {
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       in_fsp->op->global->is_resilient = true;
-
-       status = smbXsrv_open_update(in_fsp->op);
-       if (!NT_STATUS_IS_OK(status)) {
-               in_fsp->op->global->is_resilient = false;
-               return status;
-       }
-
-       return NT_STATUS_OK;
-}
-
 static void smb2_ioctl_network_fs_copychunk_done(struct tevent_req *subreq);
 static void smb2_ioctl_network_fs_offload_read_done(struct tevent_req *subreq);
 
@@ -629,17 +593,7 @@ struct tevent_req *smb2_ioctl_network_fs(uint32_t ctl_code,
                tevent_req_set_callback(
                        subreq, smb2_ioctl_network_fs_offload_read_done, req);
                return req;
-       case FSCTL_LMR_REQ_RESILIENCY:
-               status = fsctl_network_resiliency(state, ev,
-                                                 state->fsp,
-                                                 &state->in_input,
-                                                 state->in_max_output,
-                                                 &state->out_output);
-               if (!tevent_req_nterror(req, status)) {
-                       tevent_req_done(req);
-               }
-               return tevent_req_post(req, ev);
-               break;
+
        default: {
                uint8_t *out_data = NULL;
                uint32_t out_data_len = 0;

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 43bfd168de029ed0e4951fe111c5accc04bae3ce..9f0c1ffeb7f4d64a1382f38c07b5675a3d0c2eeb 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -274,9 +274,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
         *
         * We implement what the specification says.
         */
-       if (fsp->op->global->is_resilient) {
-               check_lock_sequence = true;
-       }
        if (smb2req->xconn->protocol >= PROTOCOL_SMB2_22) {
                check_lock_sequence = true;
        }