提交 352418cf 编写于 作者: A alanb

6891404: (fs) ACL tests fail with "Invalid argument" on ZFS (sol)

Reviewed-by: sherman
上级 e3597d8e
......@@ -104,11 +104,11 @@ class SolarisAclFileAttributeView
int uid;
if (user.isSpecial()) {
uid = -1;
if (who.getName().equals(UnixUserPrincipals.SPECIAL_OWNER.getName()))
if (who == UnixUserPrincipals.SPECIAL_OWNER)
flags |= ACE_OWNER;
else if (who.getName().equals(UnixUserPrincipals.SPECIAL_GROUP.getName()))
flags |= ACE_GROUP;
else if (who.getName().equals(UnixUserPrincipals.SPECIAL_EVERYONE.getName()))
else if (who == UnixUserPrincipals.SPECIAL_GROUP)
flags |= (ACE_GROUP | ACE_IDENTIFIER_GROUP);
else if (who == UnixUserPrincipals.SPECIAL_EVERYONE)
flags |= ACE_EVERYONE;
else
throw new AssertionError("Unable to map special identifier");
......@@ -281,7 +281,7 @@ class SolarisAclFileAttributeView
aceFlags.add(AclEntryFlag.DIRECTORY_INHERIT);
if ((flags & ACE_NO_PROPAGATE_INHERIT_ACE) > 0)
aceFlags.add(AclEntryFlag.NO_PROPAGATE_INHERIT);
if ((flags & ACE_INHERIT_ONLY_ACE ) > 0)
if ((flags & ACE_INHERIT_ONLY_ACE) > 0)
aceFlags.add(AclEntryFlag.INHERIT_ONLY);
// build the ACL entry and add it to the list
......
......@@ -22,7 +22,7 @@
*/
/* @test
* @bug 4313887 6838333
* @bug 4313887 6838333 6891404
* @summary Unit test for java.nio.file.attribute.AclFileAttribueView
* @library ../..
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册