r6895: Add "acl check permissions" to turn on/off the new behaviour of

checking for write access in a directory before delete. Also
controls checking for write access before labeling a file read-only
if DOS attributes are not being stored in EA's.
Docuementation to follow.
Jeremy.
(This used to be commit dd1a5e6e499dd721c5bb8d56a61810a7454a3449)

1 files changed, 10 insertions, 9 deletions

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b31e97c76f8..b5052eec256 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4006,9 +4006,8 @@ BOOL can_delete_file_in_directory(connection_struct *conn, const char *fname)
  this to successfully check for ability to write for dos filetimes.
 ****************************************************************************/
 
-BOOL can_write_to_file(connection_struct *conn, const char *fname)
+BOOL can_write_to_file(connection_struct *conn, const char *fname, SMB_STRUCT_STAT *psbuf)
 {
-	SMB_STRUCT_STAT sbuf;  
 	int ret;
 
 	if (!CAN_WRITE(conn)) {
@@ -4020,22 +4019,24 @@ BOOL can_write_to_file(connection_struct *conn, const char *fname)
 		return True;
 	}
 
-	/* Get the file permission mask and owners. */
-	if(SMB_VFS_STAT(conn, fname, &sbuf) != 0) {
-		return False;
+	if (!VALID_STAT(*psbuf)) {
+		/* Get the file permission mask and owners. */
+		if(SMB_VFS_STAT(conn, fname, psbuf) != 0) {
+			return False;
+		}
 	}
 
 	/* Check primary owner write access. */
-	if (current_user.uid == sbuf.st_uid) {
-		return (sbuf.st_mode & S_IWUSR) ? True : False;
+	if (current_user.uid == psbuf->st_uid) {
+		return (psbuf->st_mode & S_IWUSR) ? True : False;
 	}
 
 	/* Check group or explicit user acl entry write access. */
-	ret = check_posix_acl_group_write(conn, fname, &sbuf);
+	ret = check_posix_acl_group_write(conn, fname, psbuf);
 	if (ret == 0 || ret == 1) {
 		return ret ? True : False;
 	}
 
 	/* Finally check other write access. */
-	return (sbuf.st_mode & S_IWOTH) ? True : False;
+	return (psbuf->st_mode & S_IWOTH) ? True : False;
 }