Remove current_user references from trans2.c

This involved replacing the CHECK_NTQUOTA_HANDLE_OK macro by a function.
(This used to be commit 5595cdf837edb82db69a3e57bcf3108be7feeeb8)

3 files changed, 2 insertions, 7 deletions

diff --git a/source3/include/ntquotas.h b/source3/include/ntquotas.h
index 5b92b666c2..ed503b3854 100644
--- a/source3/include/ntquotas.h
+++ b/source3/include/ntquotas.h
@@ -88,9 +88,4 @@ typedef struct _SMB_NTQUOTA_HANDLE {
 	SMB_NTQUOTA_LIST *tmp_list;
 } SMB_NTQUOTA_HANDLE;
 
-#define CHECK_NTQUOTA_HANDLE_OK(fsp,conn)	(FNUM_OK(fsp,conn) &&\
-	 (fsp)->fake_file_handle &&\
-	 ((fsp)->fake_file_handle->type == FAKE_FILE_TYPE_QUOTA) &&\
-	 (fsp)->fake_file_handle->private_data)
-
 #endif /*_NTQUOTAS_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e60bfb76a1..30642678eb 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -10092,6 +10092,8 @@ bool check_fsp_open(connection_struct *conn, struct smb_request *req,
 		    files_struct *fsp);
 bool check_fsp(connection_struct *conn, struct smb_request *req,
 	       files_struct *fsp);
+bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req,
+			      files_struct *fsp);
 bool fsp_belongs_conn(connection_struct *conn, struct smb_request *req,
 		      files_struct *fsp);
 void reply_special(char *inbuf);
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 0e21431226..20e2a9a443 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -75,8 +75,6 @@
 				return ERROR_NT(NT_STATUS_INVALID_HANDLE); \
 			} while(0)
 
-#define FNUM_OK(fsp,c) ((fsp) && !(fsp)->is_directory && (c)==(fsp)->conn && current_user.vuid==(fsp)->vuid)
-
 /* 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;