The branch, v3-3-test has been updated
via 9bb057a7712393b1b699e25c5cab44401fd00005 (commit)
from 2b8c7a53860b43435f1b68235abd14e2f850a8f5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 9bb057a7712393b1b699e25c5cab44401fd00005
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Wed Oct 8 12:56:04 2008 +0200
Remove unused CHECK_FSP macro
-----------------------------------------------------------------------
Summary of changes:
source/include/smb_macros.h | 16 ----------------
source/smbd/reply.c | 5 ++---
2 files changed, 2 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h
index 20e2a9a..d2e0aa9 100644
--- a/source/include/smb_macros.h
+++ b/source/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/source/smbd/reply.c b/source/smbd/reply.c
index ae8e769..b109ee6 100644
--- a/source/smbd/reply.c
+++ b/source/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,
@@ -4275,7 +4274,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)) {
--
Samba Shared Repository
