sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

change CHECK_READ to use smb_request instead of inbuf

Browse Source
This commit is contained in:
Volker Lendecke 2008-11-06 20:16:04 +01:00
parent 807ad174b2
commit 8637dd1232
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/smb_macros.h
View File

@ -52,8 +52,8 @@
return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
} while(0)
#define CHECK_READ(fsp,inbuf) (((fsp)->fh->fd != -1) && ((fsp)->can_read || \
((SVAL((inbuf),smb_flg2) & FLAGS2_READ_PERMIT_EXECUTE) && \
#define CHECK_READ(fsp,req) (((fsp)->fh->fd != -1) && ((fsp)->can_read || \
((req->flags2 & FLAGS2_READ_PERMIT_EXECUTE) && \
(fsp->access_mask & FILE_EXECUTE))))
#define CHECK_WRITE(fsp) ((fsp)->can_write && ((fsp)->fh->fd != -1))

6
source3/smbd/reply.c
View File

@ -2894,7 +2894,7 @@ void reply_lockread(struct smb_request *req)
return;
}
if (!CHECK_READ(fsp,req->inbuf)) {
if (!CHECK_READ(fsp,req)) {
reply_doserror(req, ERRDOS, ERRbadaccess);
END_PROFILE(SMBlockread);
return;
@ -3002,7 +3002,7 @@ void reply_read(struct smb_request *req)
return;
}
if (!CHECK_READ(fsp,req->inbuf)) {
if (!CHECK_READ(fsp,req)) {
reply_doserror(req, ERRDOS, ERRbadaccess);
END_PROFILE(SMBread);
return;
@ -3255,7 +3255,7 @@ void reply_read_and_X(struct smb_request *req)
return;
}
if (!CHECK_READ(fsp,req->inbuf)) {
if (!CHECK_READ(fsp,req)) {
reply_doserror(req, ERRDOS,ERRbadaccess);
END_PROFILE(SMBreadX);
return;