From f40487698292848b93d33bbc76f92ca1c063e39e Mon Sep 17 00:00:00 2001 From: Matt Barden Date: Fri, 25 Jun 2021 19:10:28 -0400 Subject: 15013 smbsrv: cannot rename file whose name was CATIA-converted Reviewed by: Gordon Ross Reviewed by: Toomas Soome Reviewed by: Prashanth Badari Reviewed by: Suresh Jayaraman Approved by: Dan McDonald --- usr/src/uts/common/fs/smbsrv/smb_fsops.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/fs/smbsrv/smb_fsops.c b/usr/src/uts/common/fs/smbsrv/smb_fsops.c index b5ada1db91..1d46497877 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_fsops.c +++ b/usr/src/uts/common/fs/smbsrv/smb_fsops.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2020 Nexenta by DDN, Inc. All rights reserved. + * Copyright 2012-2021 Tintri by DDN, Inc. All rights reserved. */ #include @@ -1237,9 +1237,11 @@ smb_fsop_rename( return (EACCES); } - if (smb_tree_has_feature(sr->tid_tree, - SMB_TREE_ACEMASKONACCESS)) - flags = ATTR_NOACLCHECK; + /* + * TODO: avoid ACL check for source file. + * smb_vop_rename() passes its own flags to VOP_RENAME, + * and ZFS doesn't pass it on to zfs_zaccess_rename(). + */ } rc = smb_vop_rename(from_dnode->vp, from_name, to_dnode->vp, -- cgit v1.2.3