summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 14:43:12 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:56 +0200
commitc0240dbeecf74b5c3a681d919de8fb2cf3c7038e (patch)
treed16a071d9b25036b7d39bc62e384b59745121720
parent330a64c72b1eb9f2fd87a74df82d54249c5f2b36 (diff)
downloadsamba-c0240dbeecf74b5c3a681d919de8fb2cf3c7038e.tar.gz
samba-c0240dbeecf74b5c3a681d919de8fb2cf3c7038e.tar.bz2
samba-c0240dbeecf74b5c3a681d919de8fb2cf3c7038e.zip
s3: Explicitly pass sconn to find_open_smb2req
-rw-r--r--source3/smbd/smb2_create.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 37acfac589..e585d490ea 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -911,9 +911,9 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
close.
*********************************************************/
-static struct smbd_smb2_request *find_open_smb2req(uint64_t mid)
+static struct smbd_smb2_request *find_open_smb2req(
+ struct smbd_server_connection *sconn, uint64_t mid)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
struct smbd_smb2_request *smb2req;
for (smb2req = sconn->smb2.requests; smb2req; smb2req = smb2req->next) {
@@ -937,7 +937,9 @@ static struct smbd_smb2_request *find_open_smb2req(uint64_t mid)
bool open_was_deferred_smb2(uint64_t mid)
{
struct smbd_smb2_create_state *state = NULL;
- struct smbd_smb2_request *smb2req = find_open_smb2req(mid);
+ struct smbd_smb2_request *smb2req;
+
+ smb2req = find_open_smb2req(smbd_server_conn, mid);
if (!smb2req) {
DEBUG(10,("open_was_deferred_smb2: mid %llu smb2req == NULL\n",
@@ -995,7 +997,9 @@ static void remove_deferred_open_message_smb2_internal(struct smbd_smb2_request
void remove_deferred_open_message_smb2(uint64_t mid)
{
- struct smbd_smb2_request *smb2req = find_open_smb2req(mid);
+ struct smbd_smb2_request *smb2req;
+
+ smb2req = find_open_smb2req(smbd_server_conn, mid);
if (!smb2req) {
DEBUG(10,("remove_deferred_open_message_smb2: "
@@ -1030,7 +1034,9 @@ static void smbd_smb2_create_request_dispatch_immediate(struct tevent_context *c
void schedule_deferred_open_message_smb2(uint64_t mid)
{
struct smbd_smb2_create_state *state = NULL;
- struct smbd_smb2_request *smb2req = find_open_smb2req(mid);
+ struct smbd_smb2_request *smb2req;
+
+ smb2req = find_open_smb2req(smbd_server_conn, mid);
if (!smb2req) {
DEBUG(10,("schedule_deferred_open_message_smb2: "