sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:smbd: pass smbXsrv_connection to remove_deferred_open_message_smb()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-09-16 07:32:14 +02:00 committed by Michael Adam
parent d8cffad8e0
commit b05ae37da6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/smbd/open.c
View File

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

5
source3/smbd/process.c
View File

@ -692,7 +692,7 @@ static void smbd_deferred_open_timer(struct tevent_context *ev,
/* If it's still there and was processed, remove it. */ /* If it's still there and was processed, remove it. */
msg = get_deferred_open_message_smb(sconn, mid); msg = get_deferred_open_message_smb(sconn, mid);
if (msg && msg->processed) { if (msg && msg->processed) {
remove_deferred_open_message_smb(sconn, mid); remove_deferred_open_message_smb(xconn, mid);
} }
} }
@ -761,9 +761,10 @@ static bool push_queued_message(struct smb_request *req,
Function to delete a sharing violation open message by mid. Function to delete a sharing violation open message by mid.
****************************************************************************/ ****************************************************************************/
void remove_deferred_open_message_smb(struct smbd_server_connection *sconn, void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
uint64_t mid) uint64_t mid)
{ {
struct smbd_server_connection *sconn = xconn->client->sconn;
struct pending_message_list *pml; struct pending_message_list *pml;
if (sconn->using_smb2) { if (sconn->using_smb2) {

2
source3/smbd/proto.h
View File

@ -749,7 +749,7 @@ int srv_set_message(char *buf,
int num_words, int num_words,
int num_bytes, int num_bytes,
bool zero); bool zero);
void remove_deferred_open_message_smb(struct smbd_server_connection *sconn, void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
uint64_t mid); uint64_t mid);
bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn, bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn,
uint64_t mid); uint64_t mid);