From ca70ea9310fdf904011ce55cf1122043e2b42b4a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 14 Aug 2007 18:52:58 +0000 Subject: r24427: Convert reply_lock to the new API (This used to be commit 212f43ddeaa6369e5437ed3915eb066a37bc9014) --- source3/smbd/reply.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'source3/smbd/reply.c') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 37d13bfa96..00b3e514c6 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3974,30 +3974,39 @@ int reply_writeclose(connection_struct *conn, Reply to a lock. ****************************************************************************/ -int reply_lock(connection_struct *conn, - char *inbuf,char *outbuf, int length, int dum_buffsize) +void reply_lock(connection_struct *conn, struct smb_request *req) { - int outsize = set_message(inbuf,outbuf,0,0,False); SMB_BIG_UINT count,offset; NTSTATUS status; - files_struct *fsp = file_fsp(SVAL(inbuf,smb_vwv0)); + files_struct *fsp; struct byte_range_lock *br_lck = NULL; START_PROFILE(SMBlock); - CHECK_FSP(fsp,conn); + if (req->wct < 5) { + reply_nterror(req, NT_STATUS_INVALID_PARAMETER); + END_PROFILE(SMBlock); + return; + } + + fsp = file_fsp(SVAL(req->inbuf,smb_vwv0)); + + if (!check_fsp(conn, req, fsp, ¤t_user)) { + END_PROFILE(SMBlock); + return; + } release_level_2_oplocks_on_change(fsp); - count = (SMB_BIG_UINT)IVAL(inbuf,smb_vwv1); - offset = (SMB_BIG_UINT)IVAL(inbuf,smb_vwv3); + count = (SMB_BIG_UINT)IVAL(req->inbuf,smb_vwv1); + offset = (SMB_BIG_UINT)IVAL(req->inbuf,smb_vwv3); DEBUG(3,("lock fd=%d fnum=%d offset=%.0f count=%.0f\n", fsp->fh->fd, fsp->fnum, (double)offset, (double)count)); br_lck = do_lock(smbd_messaging_context(), fsp, - (uint32)SVAL(inbuf,smb_pid), + req->smbpid, count, offset, WRITE_LOCK, @@ -4009,12 +4018,15 @@ int reply_lock(connection_struct *conn, TALLOC_FREE(br_lck); if (NT_STATUS_V(status)) { + reply_nterror(req, status); END_PROFILE(SMBlock); - return ERROR_NT(status); + return; } + reply_outbuf(req, 0, 0); + END_PROFILE(SMBlock); - return(outsize); + return; } /**************************************************************************** -- cgit