summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-04-12 14:12:38 +0200
committerJeremy Allison <jra@samba.org>2013-04-26 15:17:22 -0700
commit78d4bdc0b837340d39f7f99044ac12be919f8662 (patch)
treefa659b570a70366a134aadb07e21b79239102bad
parentf52a3c3cd1ef2d6373819a7ba8c724fa9ca374f5 (diff)
downloadsamba-78d4bdc0b837340d39f7f99044ac12be919f8662.tar.gz
samba-78d4bdc0b837340d39f7f99044ac12be919f8662.tar.bz2
samba-78d4bdc0b837340d39f7f99044ac12be919f8662.zip
smbd: Obsolete MSG_SMB_OPEN_RETRY
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/librpc/idl/messaging.idl2
-rw-r--r--source3/smbd/close.c9
-rw-r--r--source3/smbd/oplock.c36
3 files changed, 1 insertions, 46 deletions
diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl
index a001c1c8c4..ddcf0e348d 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/source3/librpc/idl/messaging.idl
@@ -68,7 +68,7 @@ interface messaging
MSG_SMB_BREAK_REQUEST = 0x0306,
/* MSG_SMB_BREAK_RESPONSE = 0x0307, Obsoleted */
MSG_SMB_ASYNC_LEVEL2_BREAK = 0x0308,
- MSG_SMB_OPEN_RETRY = 0x0309,
+ /* MSG_SMB_OPEN_RETRY = 0x0309, Obsoleted */
MSG_SMB_KERNEL_BREAK = 0x030A,
MSG_SMB_FILE_RENAME = 0x030B,
MSG_SMB_INJECT_FAULT = 0x030C,
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 3389649226..b7b8d4092a 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -241,15 +241,6 @@ static void notify_deferred_opens(struct smbd_server_connection *sconn,
* zero.
*/
schedule_deferred_open_message_smb(sconn, e->op_mid);
- } else {
- char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
-
- share_mode_entry_to_message(msg, e);
-
- messaging_send_buf(sconn->msg_ctx, e->pid,
- MSG_SMB_OPEN_RETRY,
- (uint8 *)msg,
- MSG_SMB_SHARE_MODE_ENTRY_SIZE);
}
}
TALLOC_FREE(deferred);
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index aa8484a4c0..05b0d0b7a4 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -628,37 +628,6 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
add_oplock_timeout_handler(fsp);
}
-static void process_open_retry_message(struct messaging_context *msg_ctx,
- void *private_data,
- uint32_t msg_type,
- struct server_id src,
- DATA_BLOB *data)
-{
- struct share_mode_entry msg;
- struct smbd_server_connection *sconn =
- talloc_get_type_abort(private_data,
- struct smbd_server_connection);
-
- if (data->data == NULL) {
- DEBUG(0, ("Got NULL buffer\n"));
- return;
- }
-
- if (data->length != MSG_SMB_SHARE_MODE_ENTRY_SIZE) {
- DEBUG(0, ("Got invalid msg len %d\n", (int)data->length));
- return;
- }
-
- /* De-linearize incoming message. */
- message_to_share_mode_entry(&msg, (char *)data->data);
-
- DEBUG(10, ("Got open retry msg from pid %s: %s mid %llu\n",
- server_id_str(talloc_tos(), &src), file_id_string_tos(&msg.id),
- (unsigned long long)msg.op_mid));
-
- schedule_deferred_open_message_smb(sconn, msg.op_mid);
-}
-
struct break_to_none_state {
struct smbd_server_connection *sconn;
struct file_id id;
@@ -904,11 +873,6 @@ bool init_oplocks(struct smbd_server_connection *sconn)
process_oplock_async_level2_break_message);
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;
}