file_access: remove unneeded stat buf parameter from can_access_file_acl().

This is a security descriptor level function only.

Michael
(This used to be commit 5931540fa1681f026fed42df387d17e43c493c47)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index de40ff6912d447898b9d5b26fa45adf6959b2f6e..70eaf325bee158cb1e89797f289a2d43c6dc3da8 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -9641,7 +9641,7 @@ NTSTATUS close_fake_file(files_struct *fsp);
 /* The following definitions come from smbd/file_access.c  */
 
 bool can_access_file_acl(struct connection_struct *conn,
-                               const char * fname, SMB_STRUCT_STAT *psbuf,
+                               const char * fname,
                                uint32_t access_mask);
 bool can_delete_file_in_directory(connection_struct *conn, const char *fname);
 bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf, uint32 access_mask);

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index caa1c41a4fe57f6eead823329fb9c351ed3a28cf..2d9e7e75275541582a41c36da6087805613569a4 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -934,7 +934,7 @@ static bool user_can_read_file(connection_struct *conn, char *name, SMB_STRUCT_S
 
        SMB_ASSERT(VALID_STAT(*pst));
 
-       return can_access_file_acl(conn, name, pst, FILE_READ_DATA);
+       return can_access_file_acl(conn, name, FILE_READ_DATA);
 }
 
 /*******************************************************************

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index f72d6d12922e4c597f6c84b58422ea66123f27cc..aaa114b950c472f020560eab2fbdee9c986cf361 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -24,7 +24,7 @@
 #define DBGC_CLASS DBGC_ACLS
 
 bool can_access_file_acl(struct connection_struct *conn,
-                               const char * fname, SMB_STRUCT_STAT *psbuf,
+                               const char * fname,
                                uint32_t access_mask)
 {
        bool result;
@@ -114,7 +114,7 @@ bool can_delete_file_in_directory(connection_struct *conn, const char *fname)
 
        /* now for ACL checks */
 
-       return can_access_file_acl(conn, dname, &sbuf, FILE_WRITE_DATA);
+       return can_access_file_acl(conn, dname, FILE_WRITE_DATA);
 }
 
 /****************************************************************************
@@ -168,7 +168,7 @@ bool can_access_file_data(connection_struct *conn, const char *fname, SMB_STRUCT
 
        /* now for ACL checks */
 
-       return can_access_file_acl(conn, fname, psbuf, access_mask);
+       return can_access_file_acl(conn, fname, access_mask);
 }
 
 /****************************************************************************