diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-09-16 07:32:14 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-09-19 09:15:12 +0200 |
| commit | b05ae37da68c73cfc14b2ce8ef1ac08cd188cb8a (patch) | |
| tree | caaaa73d991585868f0c02e65bd0c471acc87c98 | |
| parent | d8cffad8e00e7c6bd6727e00b247bc5443ea053d (diff) | |
| download | samba-b05ae37da68c73cfc14b2ce8ef1ac08cd188cb8a.tar.gz samba-b05ae37da68c73cfc14b2ce8ef1ac08cd188cb8a.tar.xz samba-b05ae37da68c73cfc14b2ce8ef1ac08cd188cb8a.zip | |
s3:smbd: pass smbXsrv_connection to remove_deferred_open_message_smb()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/open.c | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 5 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 7626b58b09..7cc2642834 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2205,7 +2205,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, } /* 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; } diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 0ed78309be..048d4f8a58 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -692,7 +692,7 @@ static void smbd_deferred_open_timer(struct tevent_context *ev, /* If it's still there and was processed, remove it. */ msg = get_deferred_open_message_smb(sconn, mid); 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. ****************************************************************************/ -void remove_deferred_open_message_smb(struct smbd_server_connection *sconn, +void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn, uint64_t mid) { + struct smbd_server_connection *sconn = xconn->client->sconn; struct pending_message_list *pml; if (sconn->using_smb2) { diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 69e2ba45a1..708f3892e1 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -749,7 +749,7 @@ int srv_set_message(char *buf, int num_words, int num_bytes, 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); bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn, uint64_t mid); |