summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-08-02 17:07:25 +0200
committerVolker Lendecke <vl@samba.org>2011-08-02 19:18:08 +0200
commitcb69d105f5cb0336e3b97bf864d164d4daeab5ab (patch)
tree9d456531e3900ffd1a1435798b7bdf2e8bf47b75 /source3
parentf9d183f931f021c7b76047766838388cb7686c37 (diff)
downloadsamba-cb69d105f5cb0336e3b97bf864d164d4daeab5ab.tar.gz
samba-cb69d105f5cb0336e3b97bf864d164d4daeab5ab.tar.bz2
samba-cb69d105f5cb0336e3b97bf864d164d4daeab5ab.zip
s3: Pass sconn explicitly to get_deferred_open_message_smb
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0160c35621..e87032b2f3 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -41,7 +41,8 @@ extern bool global_machine_password_needs_changing;
static void construct_reply_common(struct smb_request *req, const char *inbuf,
char *outbuf);
-static struct pending_message_list *get_deferred_open_message_smb(uint64_t mid);
+static struct pending_message_list *get_deferred_open_message_smb(
+ struct smbd_server_connection *sconn, uint64_t mid);
static bool smbd_lock_socket_internal(struct smbd_server_connection *sconn)
{
@@ -580,7 +581,7 @@ static void smbd_deferred_open_timer(struct event_context *ev,
msg->seqnum, msg->encrypted, &msg->pcd);
/* If it's still there and was processed, remove it. */
- msg = get_deferred_open_message_smb(mid);
+ msg = get_deferred_open_message_smb(smbd_server_conn, mid);
if (msg && msg->processed) {
remove_deferred_open_message_smb(smbd_server_conn, mid);
}
@@ -763,7 +764,8 @@ bool open_was_deferred(struct smbd_server_connection *sconn, uint64_t mid)
Return the message queued by this mid.
****************************************************************************/
-static struct pending_message_list *get_deferred_open_message_smb(uint64_t mid)
+static struct pending_message_list *get_deferred_open_message_smb(
+ struct smbd_server_connection *sconn, uint64_t mid)
{
struct pending_message_list *pml;
@@ -791,7 +793,7 @@ bool get_deferred_open_message_state(struct smb_request *smbreq,
pp_state);
}
- pml = get_deferred_open_message_smb(smbreq->mid);
+ pml = get_deferred_open_message_smb(smbreq->sconn, smbreq->mid);
if (!pml) {
return false;
}