summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Barden <mbarden@tintri.com>2021-06-25 19:10:28 -0400
committerDan McDonald <danmcd@mnx.io>2022-10-04 23:16:50 -0400
commitf40487698292848b93d33bbc76f92ca1c063e39e (patch)
treecdc80053eadae4d6d3207fc7caaf04639db886fa
parent1b38ec66a3ea040587c1b346f8c010a3b37c8080 (diff)
downloadillumos-joyent-f40487698292848b93d33bbc76f92ca1c063e39e.tar.gz
15013 smbsrv: cannot rename file whose name was CATIA-converted
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Prashanth Badari <prbadari@tintri.com> Reviewed by: Suresh Jayaraman <sjayaraman@tintri.com> Approved by: Dan McDonald <danmcd@mnx.io>
-rw-r--r--usr/src/uts/common/fs/smbsrv/smb_fsops.c10
1 files changed, 6 insertions, 4 deletions
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 <sys/sid.h>
@@ -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,