Fix bug #6154 - zfs does not honor admin users.

Jeremy

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index fe7ba1cc466e2221958242e9c8632078036f1ad7..abffcd2f4fd6cd7305ac02a3ee7ccf22cbb5abac 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -34,6 +34,11 @@ bool can_access_file_acl(struct connection_struct *conn,
        uint32_t access_granted;
        struct security_descriptor *secdesc = NULL;
 
+       if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+               /* I'm sorry sir, I didn't know you were root... */
+               return true;
+       }
+
        status = SMB_VFS_GET_NT_ACL(conn, fname,
                                    (OWNER_SECURITY_INFORMATION |
                                     GROUP_SECURITY_INFORMATION |