sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3: Explicitly pass sconn to remove_deferred_open_message_smb

Browse Source
This commit is contained in:
Volker Lendecke 2011-08-02 16:53:33 +02:00
parent 77f5246f09
commit 04253dfd9f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/open.c
View File

@ -1621,7 +1621,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
sconn_server_id(req->sconn));
/* Ensure we don't reprocess this message. */
remove_deferred_open_message_smb(req->mid);
remove_deferred_open_message_smb(req->sconn, req->mid);
}
}

9
source3/smbd/process.c
View File

@ -582,7 +582,7 @@ static void smbd_deferred_open_timer(struct event_context *ev,
/* If it's still there and was processed, remove it. */
msg = get_deferred_open_message_smb(mid);
if (msg && msg->processed) {
remove_deferred_open_message_smb(mid);
remove_deferred_open_message_smb(smbd_server_conn, mid);
}
}
@ -652,12 +652,13 @@ static bool push_queued_message(struct smb_request *req,
Function to delete a sharing violation open message by mid.
****************************************************************************/
void remove_deferred_open_message_smb(uint64_t mid)
void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
uint64_t mid)
{
struct pending_message_list *pml;
if (smbd_server_conn->using_smb2) {
remove_deferred_open_message_smb2(smbd_server_conn, mid);
if (sconn->using_smb2) {
remove_deferred_open_message_smb2(sconn, mid);
return;
}

3
source3/smbd/proto.h
View File

@ -771,7 +771,8 @@ int srv_set_message(char *buf,
int num_words,
int num_bytes,
bool zero);
void remove_deferred_open_message_smb(uint64_t mid);
void remove_deferred_open_message_smb(struct smbd_server_connection *sconn,
uint64_t mid);
void schedule_deferred_open_message_smb(uint64_t mid);
bool open_was_deferred(uint64_t mid);
bool get_deferred_open_message_state(struct smb_request *smbreq,