Date: Sat, 23 May 2009 16:12:32 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 162577 for review Message-ID: <200905231612.n4NGCWAW057034@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162577 Change 162577 by trasz@trasz_victim on 2009/05/23 16:12:01 More renaming - further away from OSX, closer to RFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#8 edit .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#4 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#42 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#35 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_flag_np.3#3 (text+ko) ==== @@ -55,8 +55,8 @@ .Bd -literal -offset indent -compact ACL_ENTRY_FILE_INHERIT Will be inherited by files. ACL_ENTRY_DIRECTORY_INHERIT Will be inherited by directories. -ACL_ENTRY_LIMIT_INHERIT Will not propagate. -ACL_ENTRY_ONLY_INHERIT Inherit-only. +ACL_ENRY_NO_PROPAGATE_INHERIT Will not propagate. +ACL_ENTRY_INHERIT_ONLY Inherit-only. .Ed .Sh RETURN VALUES .Rv -std acl_add_flag_np ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support_nfs4.c#8 (text+ko) ==== @@ -42,8 +42,8 @@ struct flagnames_struct a_flags[] = {{ ACL_ENTRY_FILE_INHERIT, "file_inherit", 'f'}, { ACL_ENTRY_DIRECTORY_INHERIT, "dir_inherit", 'd'}, - { ACL_ENTRY_ONLY_INHERIT, "inherit_only", 'i'}, - { ACL_ENTRY_LIMIT_INHERIT, "no_propagate", 'n'}, + { ACL_ENTRY_INHERIT_ONLY, "inherit_only", 'i'}, + { ACL_ENRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'}, { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'}, { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'}, /* ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/acl.9#4 (text+ko) ==== @@ -183,8 +183,8 @@ .Bl -tag -width ".Dv ACL_ENTRY_DIRECTORY_INHERIT" .It Dv ACL_ENTRY_FILE_INHERIT .It Dv ACL_ENTRY_DIRECTORY_INHERIT -.It Dv ACL_ENTRY_LIMIT_INHERIT -.It Dv ACL_ENTRY_ONLY_INHERIT +.It Dv ACL_ENRY_NO_PROPAGATE_INHERIT +.It Dv ACL_ENTRY_INHERIT_ONLY .El .El .Sh SEE ALSO ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/acl_compat.c#10 (text+ko) ==== @@ -90,12 +90,18 @@ {ACE_SYNCHRONIZE, ACL_SYNCHRONIZE}, {0, 0}}; -struct zfs2bsd flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_FILE_INHERIT}, - {ACE_DIRECTORY_INHERIT_ACE, ACL_ENTRY_DIRECTORY_INHERIT}, - {ACE_NO_PROPAGATE_INHERIT_ACE, ACL_ENTRY_LIMIT_INHERIT}, - {ACE_INHERIT_ONLY_ACE, ACL_ENTRY_ONLY_INHERIT}, - {ACE_SUCCESSFUL_ACCESS_ACE_FLAG, ACL_ENTRY_SUCCESSFUL_ACCESS}, - {ACE_FAILED_ACCESS_ACE_FLAG, ACL_ENTRY_FAILED_ACCESS}, +struct zfs2bsd flags[] = {{ACE_FILE_INHERIT_ACE, + ACL_ENTRY_FILE_INHERIT}, + {ACE_DIRECTORY_INHERIT_ACE, + ACL_ENTRY_DIRECTORY_INHERIT}, + {ACE_NO_PROPAGATE_INHERIT_ACE, + ACL_ENTRY_NO_PROPAGATE_INHERIT}, + {ACE_INHERIT_ONLY_ACE, + ACL_ENTRY_INHERIT_ONLY}, + {ACE_SUCCESSFUL_ACCESS_ACE_FLAG, + ACL_ENTRY_SUCCESSFUL_ACCESS}, + {ACE_FAILED_ACCESS_ACE_FLAG, + ACL_ENTRY_FAILED_ACCESS}, {0, 0}}; static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#3 (text+ko) ==== @@ -128,11 +128,11 @@ } if (flag & NFSV4ACE_NOPROPAGATEINHERIT) { flag &= ~NFSV4ACE_NOPROPAGATEINHERIT; - acep->ae_flags |= ACL_ENTRY_LIMIT_INHERIT; + acep->ae_flags |= ACL_ENTRY_NO_PROPAGATE_INHERIT; } if (flag & NFSV4ACE_INHERITONLY) { flag &= ~NFSV4ACE_INHERITONLY; - acep->ae_flags |= ACL_ENTRY_ONLY_INHERIT; + acep->ae_flags |= ACL_ENTRY_INHERIT_ONLY; } if (flag & NFSV4ACE_SUCCESSFULACCESS) { flag &= ~NFSV4ACE_SUCCESSFULACCESS; @@ -483,9 +483,9 @@ aceflag |= NFSV4ACE_FILEINHERIT; if (ace->ae_flags & ACL_ENTRY_DIRECTORY_INHERIT) aceflag |= NFSV4ACE_DIRECTORYINHERIT; - if (ace->ae_flags & ACL_ENTRY_LIMIT_INHERIT) + if (ace->ae_flags & ACL_ENTRY_NO_PROPAGATE_INHERIT) aceflag |= NFSV4ACE_NOPROPAGATEINHERIT; - if (ace->ae_flags & ACL_ENTRY_ONLY_INHERIT) + if (ace->ae_flags & ACL_ENTRY_INHERIT_ONLY) aceflag |= NFSV4ACE_INHERITONLY; if (ace->ae_flags & ACL_ENTRY_SUCCESSFUL_ACCESS) aceflag |= NFSV4ACE_SUCCESSFULACCESS; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#42 (text+ko) ==== @@ -110,7 +110,7 @@ entry->ae_entry_type != ACL_ENTRY_TYPE_DENY) continue; - if (entry->ae_flags & ACL_ENTRY_ONLY_INHERIT) + if (entry->ae_flags & ACL_ENTRY_INHERIT_ONLY) continue; switch (entry->ae_tag) { @@ -362,9 +362,9 @@ continue; /* - * 1.2. If ACL_ENTRY_ONLY_INHERIT is set - skip. + * 1.2. If ACL_ENTRY_INHERIT_ONLY is set - skip. */ - if (entry->ae_flags & ACL_ENTRY_ONLY_INHERIT) + if (entry->ae_flags & ACL_ENTRY_INHERIT_ONLY) continue; /* @@ -382,20 +382,20 @@ /* * 1.3.2. In the first ACE, the flag - * ACL_ENTRY_ONLY_INHERIT is set. + * ACL_ENTRY_INHERIT_ONLY is set. */ - entry->ae_flags |= ACL_ENTRY_ONLY_INHERIT; + entry->ae_flags |= ACL_ENTRY_INHERIT_ONLY; /* * 1.3.3. In the second ACE, the following flags * are cleared: * ACL_ENTRY_FILE_INHERIT, * ACL_ENTRY_DIRECTORY_INHERIT, - * ACL_ENTRY_LIMIT_INHERIT. + * ACL_ENRY_NO_PROPAGATE_INHERIT. */ copy->ae_flags &= ~(ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENTRY_LIMIT_INHERIT); + ACL_ENRY_NO_PROPAGATE_INHERIT); /* * The algorithm continues on with the second ACE. @@ -695,7 +695,7 @@ entry->ae_entry_type != ACL_ENTRY_TYPE_DENY) continue; - if (entry->ae_flags & ACL_ENTRY_ONLY_INHERIT) + if (entry->ae_flags & ACL_ENTRY_INHERIT_ONLY) continue; if (entry->ae_tag == ACL_USER_OBJ) { @@ -855,7 +855,7 @@ */ if (is_directory && (flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0 && - (flags & ACL_ENTRY_LIMIT_INHERIT)) + (flags & ACL_ENRY_NO_PROPAGATE_INHERIT)) continue; KASSERT(child_aclp->acl_cnt + 1 <= ACL_MAX_ENTRIES, @@ -875,23 +875,23 @@ * This is not in the specification, but SunOS * apparently does that. */ - if (((entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT) || + if (((entry->ae_flags & ACL_ENRY_NO_PROPAGATE_INHERIT) || !is_directory) && entry->ae_entry_type == ACL_ENTRY_TYPE_ALLOW) entry->ae_perm &= ~(ACL_WRITE_ACL | ACL_WRITE_OWNER); /* - * 2.A. If the ACL_ENTRY_LIMIT_INHERIT is set, or if the object + * 2.A. If the ACL_ENRY_NO_PROPAGATE_INHERIT is set, or if the object * being created is not a directory, then clear the - * following flags: ACL_ENTRY_LIMIT_INHERIT, + * following flags: ACL_ENRY_NO_PROPAGATE_INHERIT, * ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT, - * ACL_ENTRY_ONLY_INHERIT. + * ACL_ENTRY_INHERIT_ONLY. */ - if (entry->ae_flags & ACL_ENTRY_LIMIT_INHERIT || + if (entry->ae_flags & ACL_ENRY_NO_PROPAGATE_INHERIT || !is_directory) { - entry->ae_flags &= ~(ACL_ENTRY_LIMIT_INHERIT | + entry->ae_flags &= ~(ACL_ENRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENTRY_ONLY_INHERIT); + ACL_ENTRY_INHERIT_ONLY); /* * Continue on to the next ACE. @@ -901,8 +901,8 @@ /* * 2.B. If the object is a directory and ACL_ENTRY_FILE_INHERIT - * is set, but ACL_ENTRY_LIMIT_INHERIT is not set, ensure - * that ACL_ENTRY_ONLY_INHERIT is set. Continue to the + * is set, but ACL_ENRY_NO_PROPAGATE_INHERIT is not set, ensure + * that ACL_ENTRY_INHERIT_ONLY is set. Continue to the * next ACE. Otherwise... */ /* @@ -912,7 +912,7 @@ if (is_directory && (entry->ae_flags & ACL_ENTRY_FILE_INHERIT) && ((entry->ae_flags & ACL_ENTRY_DIRECTORY_INHERIT) == 0)) { - entry->ae_flags |= ACL_ENTRY_ONLY_INHERIT; + entry->ae_flags |= ACL_ENTRY_INHERIT_ONLY; continue; } @@ -930,19 +930,19 @@ copy = _acl_duplicate_entry(child_aclp, i); /* - * 2.E. On the first ACE, ensure that ACL_ENTRY_ONLY_INHERIT + * 2.E. On the first ACE, ensure that ACL_ENTRY_INHERIT_ONLY * is set. */ - entry->ae_flags |= ACL_ENTRY_ONLY_INHERIT; + entry->ae_flags |= ACL_ENTRY_INHERIT_ONLY; /* * 2.F. On the second ACE, clear the following flags: - * ACL_ENTRY_LIMIT_INHERIT, ACL_ENTRY_FILE_INHERIT, - * ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_ONLY_INHERIT. + * ACL_ENRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_FILE_INHERIT, + * ACL_ENTRY_DIRECTORY_INHERIT, ACL_ENTRY_INHERIT_ONLY. */ - copy->ae_flags &= ~(ACL_ENTRY_LIMIT_INHERIT | + copy->ae_flags &= ~(ACL_ENRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENTRY_ONLY_INHERIT); + ACL_ENTRY_INHERIT_ONLY); /* * 2.G. On the second ACE, if the type is ALLOW, @@ -1095,7 +1095,7 @@ if (!is_directory) { if (entry->ae_flags & (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | - ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT)) + ACL_ENRY_NO_PROPAGATE_INHERIT | ACL_ENTRY_INHERIT_ONLY)) return (EINVAL); } } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#35 (text+ko) ==== @@ -233,14 +233,14 @@ */ #define ACL_ENTRY_FILE_INHERIT 0x0001 #define ACL_ENTRY_DIRECTORY_INHERIT 0x0002 -#define ACL_ENTRY_LIMIT_INHERIT 0x0004 /* "NO_PROPAGATE_INHERIT" */ -#define ACL_ENTRY_ONLY_INHERIT 0x0008 /* "INHERIT_ONLY" */ +#define ACL_ENTRY_NO_PROPAGATE_INHERIT 0x0004 +#define ACL_ENTRY_INHERIT_ONLY 0x0008 #define ACL_ENTRY_SUCCESSFUL_ACCESS 0x0010 #define ACL_ENTRY_FAILED_ACCESS 0x0020 #define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | \ - ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_LIMIT_INHERIT | \ - ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \ + ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_NO_PROPAGATE_INHERIT | \ + ACL_ENTRY_INHERIT_ONLY | ACL_ENTRY_SUCCESSFUL_ACCESS | \ ACL_ENTRY_FAILED_ACCESS) /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905231612.n4NGCWAW057034>