3 files changed, 8 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 1fc7c83e8e..391bab7379 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -988,12 +988,16 @@ bool init_oplocks(struct smbd_server_connection *sconn)
 			   process_oplock_break_message);
 	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_ASYNC_LEVEL2_BREAK,
 			   process_oplock_async_level2_break_message);
+#if 0
 	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_BREAK_RESPONSE,
 			   process_oplock_break_response);
+#endif
 	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_KERNEL_BREAK,
 			   process_kernel_oplock_break);
+#if 0
 	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_OPEN_RETRY,
 			   process_open_retry_message);
+#endif
 
 	return true;
 }
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 20e2c11a84..3445ae56c5 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -664,6 +664,7 @@ static bool push_queued_message(struct smb_request *req,
 		}
 	}
 
+#if 0
 	msg->te = tevent_add_timer(msg->sconn->ev_ctx,
 				   msg,
 				   end_time,
@@ -674,6 +675,7 @@ static bool push_queued_message(struct smb_request *req,
 		TALLOC_FREE(msg);
 		return false;
 	}
+#endif
 
 	DLIST_ADD_END(req->sconn->deferred_open_queue, msg,
 		      struct pending_message_list *);
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index fe0c4e48d2..0e1a8d01dc 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1459,6 +1459,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
 				true) ));
 
 	state->open_was_deferred = true;
+#if 0
 	state->te = tevent_add_timer(smb2req->sconn->ev_ctx,
 				state,
 				end_time,
@@ -1467,6 +1468,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
         if (!state->te) {
 		return false;
 	}
+#endif
 
 	/* allow this request to be canceled */
 	tevent_req_set_cancel_fn(req, smbd_smb2_create_cancel);