diff options
| author | Volker Lendecke <vl@samba.org> | 2008-10-08 12:56:04 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-10-08 13:01:22 +0200 |
| commit | be63f86ce7029b0a4efbe1478cc16189b5d26aec (patch) | |
| tree | ee65bfe3f4f5a926e2c915eb86cad020dd248edf | |
| parent | 71ef7ae824b1e8d411590a9a7dbd1f5b86b9df5e (diff) | |
| download | samba-be63f86ce7029b0a4efbe1478cc16189b5d26aec.tar.gz samba-be63f86ce7029b0a4efbe1478cc16189b5d26aec.tar.bz2 samba-be63f86ce7029b0a4efbe1478cc16189b5d26aec.zip | |
Remove unused CHECK_FSP macro
| -rw-r--r-- | source3/include/smb_macros.h | 16 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 5 |
2 files changed, 2 insertions, 19 deletions
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 20e2a9a443..d2e0aa95ac 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -75,22 +75,6 @@ return ERROR_NT(NT_STATUS_INVALID_HANDLE); \ } while(0) -/* you must add the following extern declaration to files using this macro - * (do not add it to the macro as that causes nested extern declaration warnings) - * extern struct current_user current_user; - */ -#define CHECK_FSP(fsp,conn) do {\ - if (!(fsp) || !(conn)) \ - return ERROR_NT(NT_STATUS_INVALID_HANDLE); \ - else if (((conn) != (fsp)->conn) || current_user.vuid != (fsp)->vuid) \ - return ERROR_NT(NT_STATUS_INVALID_HANDLE); \ - else if ((fsp)->is_directory) \ - return ERROR_NT(NT_STATUS_INVALID_DEVICE_REQUEST); \ - else if ((fsp)->fh->fd == -1) \ - return ERROR_NT(NT_STATUS_ACCESS_DENIED); \ - (fsp)->num_smb_operations++;\ - } while(0) - #define CHECK_READ(fsp,inbuf) (((fsp)->fh->fd != -1) && ((fsp)->can_read || \ ((SVAL((inbuf),smb_flg2) & FLAGS2_READ_PERMIT_EXECUTE) && \ (fsp->access_mask & FILE_EXECUTE)))) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 0226d314f7..48403073f7 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -339,8 +339,7 @@ bool check_fsp_open(connection_struct *conn, struct smb_request *req, } /**************************************************************************** - Check if we have a correct fsp pointing to a file. Replacement for the - CHECK_FSP macro. + Check if we have a correct fsp pointing to a file. ****************************************************************************/ bool check_fsp(connection_struct *conn, struct smb_request *req, @@ -4272,7 +4271,7 @@ void reply_close(struct smb_request *req) fsp = file_fsp(SVAL(req->inbuf,smb_vwv0)); /* - * We can only use CHECK_FSP if we know it's not a directory. + * We can only use check_fsp if we know it's not a directory. */ if(!fsp || (fsp->conn != conn) || (fsp->vuid != req->vuid)) { |