summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 11:46:29 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:52 +0200
commit8f8aac9c2fae57351785e28afc7096f9dc7be028 (patch)
tree08f3e0b4be42f6eff4ef9b06ef2642cc3cdb8ef3 /source3
parente16476ac4839199f71db2c1687388cc7e84ce2bc (diff)
downloadsamba-8f8aac9c2fae57351785e28afc7096f9dc7be028.tar.gz
samba-8f8aac9c2fae57351785e28afc7096f9dc7be028.tar.bz2
samba-8f8aac9c2fae57351785e28afc7096f9dc7be028.zip
s3: Remove smbd_server_conn from reply_read_and_X
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4a7cb98377..67a955c980 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3661,7 +3661,7 @@ void reply_read_and_X(struct smb_request *req)
return;
}
/* We currently don't do this on signed or sealed data. */
- if (srv_is_signing_active(smbd_server_conn) ||
+ if (srv_is_signing_active(req->sconn) ||
is_encrypted_packet(req->inbuf)) {
reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
END_PROFILE(SMBreadX);
@@ -3723,9 +3723,9 @@ void reply_read_and_X(struct smb_request *req)
/* NT_STATUS_RETRY - fall back to sync read. */
}
- smbd_lock_socket(smbd_server_conn);
+ smbd_lock_socket(req->sconn);
send_file_readX(conn, req, fsp, startpos, smb_maxcnt);
- smbd_unlock_socket(smbd_server_conn);
+ smbd_unlock_socket(req->sconn);
out:
END_PROFILE(SMBreadX);