stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: sherman
This commit is contained in:
Alan Bateman 2009-10-15 11:55:19 +01:00
parent 347f6581ea
commit d7441d8772
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
View File

@ -104,11 +104,11 @@ class SolarisAclFileAttributeView
int uid; int uid;
if (user.isSpecial()) { if (user.isSpecial()) {
uid = -1; uid = -1;
if (who.getName().equals(UnixUserPrincipals.SPECIAL_OWNER.getName())) if (who == UnixUserPrincipals.SPECIAL_OWNER)
flags |= ACE_OWNER; flags |= ACE_OWNER;
else if (who.getName().equals(UnixUserPrincipals.SPECIAL_GROUP.getName())) else if (who == UnixUserPrincipals.SPECIAL_GROUP)
flags |= ACE_GROUP; flags |= (ACE_GROUP | ACE_IDENTIFIER_GROUP);
else if (who.getName().equals(UnixUserPrincipals.SPECIAL_EVERYONE.getName())) else if (who == UnixUserPrincipals.SPECIAL_EVERYONE)
flags |= ACE_EVERYONE; flags |= ACE_EVERYONE;
else else
throw new AssertionError("Unable to map special identifier"); throw new AssertionError("Unable to map special identifier");
@ -281,7 +281,7 @@ class SolarisAclFileAttributeView
aceFlags.add(AclEntryFlag.DIRECTORY_INHERIT); aceFlags.add(AclEntryFlag.DIRECTORY_INHERIT);
if ((flags & ACE_NO_PROPAGATE_INHERIT_ACE) > 0) if ((flags & ACE_NO_PROPAGATE_INHERIT_ACE) > 0)
aceFlags.add(AclEntryFlag.NO_PROPAGATE_INHERIT); 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); aceFlags.add(AclEntryFlag.INHERIT_ONLY);
// build the ACL entry and add it to the list // build the ACL entry and add it to the list

2
jdk/test/java/nio/file/attribute/AclFileAttributeView/Basic.java
View File

@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 4313887 6838333 * @bug 4313887 6838333 6891404
* @summary Unit test for java.nio.file.attribute.AclFileAttribueView * @summary Unit test for java.nio.file.attribute.AclFileAttribueView
* @library ../.. * @library ../..
*/ */