diff options
| author | Ralph Boehme <slow@samba.org> | 2017-06-09 12:57:03 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2017-07-03 19:59:08 +0200 |
| commit | 697d8e9e2a48643fe771723beaf1c33f625921f6 (patch) | |
| tree | 0b0fd66a51529d04a9b89bb0f69ea6a9689881b8 | |
| parent | 64bedefa117b4861a752c4e2fc3f5e775eb7f542 (diff) | |
| download | samba-697d8e9e2a48643fe771723beaf1c33f625921f6.tar.gz | |
s3/smbd: remove ununsed req arg from CHECK_READ_IOCTL macro
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/include/smb_macros.h | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_ioctl_network_fs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index f8656c73014..de39bf616e1 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -62,7 +62,7 @@ * ). On Windows servers, this is done by the IO manager, which is unaware of * the "if execute is granted then also grant read" arrangement. */ -#define CHECK_READ_IOCTL(fsp, req) (((fsp)->fh->fd != -1) && ((fsp)->can_read)) +#define CHECK_READ_IOCTL(fsp) (((fsp)->fh->fd != -1) && ((fsp)->can_read)) #define CHECK_WRITE(fsp) ((fsp)->can_write && ((fsp)->fh->fd != -1)) diff --git a/source3/smbd/smb2_ioctl_network_fs.c b/source3/smbd/smb2_ioctl_network_fs.c index 82432baf94f..180fac2b44b 100644 --- a/source3/smbd/smb2_ioctl_network_fs.c +++ b/source3/smbd/smb2_ioctl_network_fs.c @@ -116,7 +116,7 @@ static NTSTATUS copychunk_check_handles(uint32_t ctl_code, * FILE_READ_DATA, and the CtlCode is FSCTL_SRV_COPYCHUNK. */ if ((ctl_code == FSCTL_SRV_COPYCHUNK) && - !CHECK_READ_IOCTL(dst_fsp, smb1req)) { + !CHECK_READ_IOCTL(dst_fsp)) { DEBUG(5, ("copy chunk no read on dest handle (%s).\n", smb_fname_str_dbg(dst_fsp->fsp_name) )); return NT_STATUS_ACCESS_DENIED; |