PERFORCE change 162794 for review
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue May 26 17:40:44 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=162794
Change 162794 by trasz at trasz_victim on 2009/05/26 17:40:09
Use the "NFSv4" name consistently.
Affected files ...
.. //depot/projects/soc2008/trasz_nfs4acl/TODO#54 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#8 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#12 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#6 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#11 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#7 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#15 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#12 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#9 edit
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#6 edit
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#26 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#18 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#37 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#27 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#2 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#9 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#2 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#5 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#3 edit
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#4 edit
Differences ...
==== //depot/projects/soc2008/trasz_nfs4acl/TODO#54 (text+ko) ====
@@ -14,14 +14,14 @@
- Talk about semantics. Do whatever is needed.
-- Figure out whether this thing should be called 'NFS4' or 'NFSv4'.
+- Figure out whether this thing should be called 'nfs4' or 'nfsv4'.
Use this name consistently.
- Review.
Things to do, in no particular order:
-- Add support for NFS4 ACLs to tar(1).
+- Add support for NFSv4 ACLs to tar(1).
- Make 'struct acl' variable size.
==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#3 (text+ko) ====
@@ -182,7 +182,7 @@
}
newmode = getmode(set, p->fts_statp->st_mode);
/*
- * With NFS4 ACLs, it is possible that applying a mode
+ * With NFSv4 ACLs, it is possible that applying a mode
* identical to the one computed from an ACL will change
* that ACL.
*/
==== //depot/projects/soc2008/trasz_nfs4acl/bin/cp/utils.c#8 (text+ko) ====
@@ -421,8 +421,8 @@
if (source_type != dest_type) {
warnx("ACL brand of source is %s, but destination is %s; "
"ACL not copied",
- source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX",
- dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX");
+ source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e",
+ dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e");
return (0);
}
@@ -470,8 +470,8 @@
if (source_type != dest_type) {
warnx("ACL brand of source is %s, but destination is %s; "
"ACL not copied",
- source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX",
- dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX");
+ source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e",
+ dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e");
return (0);
}
==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#7 (text+ko) ====
@@ -61,12 +61,12 @@
access ACL.
An error is generated if a default ACL cannot be associated with
.Ar file .
-This option is not valid for NFS4 ACLs.
+This option is not valid for NFSv4 ACLs.
.It Fl h
If the target of the operation is a symbolic link, return the ACL from
the symbolic link itself rather than following the link.
.It Fl i
-For NFS4 ACLs, append numerical ID at the end of each entry containing
+For NFSv4 ACLs, append numerical ID at the end of each entry containing
user or group name.
.It Fl n
Display user and group IDs numerically rather than converting to
@@ -77,7 +77,7 @@
This is
useful when dealing with filenames with unprintable characters.
.It Fl v
-For NFS4 ACLs, display access mask and flags in a verbose form.
+For NFSv4 ACLs, display access mask and flags in a verbose form.
For POSIX.1e ACLs, this option does nothing.
.El
.Pp
==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#12 (text+ko) ====
@@ -199,7 +199,7 @@
if (pathconf(path, _PC_EXTENDED_SECURITY_NP)) {
if (type == ACL_TYPE_DEFAULT) {
- warnx("%s: there are no default entries in NFS4 ACLs",
+ warnx("%s: there are no default entries in NFSv4 ACLs",
path);
return (-1);
}
==== //depot/projects/soc2008/trasz_nfs4acl/bin/mv/mv.c#6 (text+ko) ====
@@ -482,8 +482,8 @@
if (source_type != dest_type) {
warnx("ACL brand of source is %s, but destination is %s; "
"ACL not copied",
- source_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX",
- dest_type == ACL_TYPE_NFS4 ? "NFS4" : "POSIX");
+ source_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e",
+ dest_type == ACL_TYPE_NFS4 ? "NFSv4" : "POSIX.1e");
return (0);
}
==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#11 (text+ko) ====
@@ -103,8 +103,8 @@
if (acl_brand != prev_acl_brand) {
warnx("%s: branding mismatch; existing ACL is %s, "
"entry to be merged is %s", filename,
- prev_acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX",
- acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX");
+ prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
+ acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
return (-1);
}
@@ -140,7 +140,7 @@
continue;
/*
- * For NFS4, in addition to "tag" and "id" we also
+ * For NFSv4, in addition to "tag" and "id" we also
* compare "entry_type".
*/
if (acl_brand == ACL_BRAND_NFS4) {
@@ -201,7 +201,7 @@
if (have_entry == 0) {
/*
- * NFS4 ACL entries must be prepended to the ACL.
+ * NFSv4 ACL entries must be prepended to the ACL.
* Appending them at the end makes no sense, since
* in most cases they wouldn't even get evaluated.
*/
@@ -247,15 +247,15 @@
acl_get_brand_np(*prev_acl, &prev_acl_brand);
if (prev_acl_brand != ACL_BRAND_NFS4) {
- warnx("%s: the '-a' option is only applicable to NFS4 ACLs",
+ warnx("%s: the '-a' option is only applicable to NFSv4 ACLs",
filename);
return (-1);
}
if (acl_brand != ACL_BRAND_NFS4) {
- warnx("%s: branding mismatch; existing ACL is NFS4, "
+ warnx("%s: branding mismatch; existing ACL is NFSv4, "
"entry to be added is %s", filename,
- acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX");
+ acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
return (-1);
}
==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#7 (text+ko) ====
@@ -56,8 +56,8 @@
if (acl_brand != prev_acl_brand) {
warnx("%s: branding mismatch; existing ACL is %s, "
"entry to be removed is %s", filename,
- prev_acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX",
- acl_brand == ACL_BRAND_NFS4 ? "NFS4" : "POSIX");
+ prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e",
+ acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e");
return (-1);
}
==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#5 (text+ko) ====
@@ -59,10 +59,10 @@
starting at position
.Ar position ,
counting from zero.
-This option is only applicable to NFS4 ACLs.
+This option is only applicable to NFSv4 ACLs.
.It Fl b
Remove all ACL entries except for the three required entries
-(POSIX.1e ACLs) or six "canonical" entries (NFS4 ACLs).
+(POSIX.1e ACLs) or six "canonical" entries (NFSv4 ACLs).
If the POSIX.1e ACL contains a
.Dq Li mask
entry, the permissions of the
@@ -77,7 +77,7 @@
The operations apply to the default ACL entries instead of
access ACL entries.
Currently only directories may have
-default ACL's. This option is not applicable to NFS4 ACLs.
+default ACL's. This option is not applicable to NFSv4 ACLs.
.It Fl h
If the target of the operation is a symbolic link, perform the operation
on the symbolic link itself, rather than following the link.
@@ -88,7 +88,7 @@
any default ACL entries.
An error will be reported if any of
the specified files cannot have a default entry (i.e.\&
-non-directories). This option is not applicable to NFS4 ACLs.
+non-directories). This option is not applicable to NFSv4 ACLs.
.It Fl m Ar entries
Modify the ACL entries on the specified files by adding new
entries and modifying existing ACL entries with the ACL entries
@@ -106,7 +106,7 @@
the input is taken from stdin.
.It Fl n
Do not recalculate the permissions associated with the ACL
-mask entry. This option is not applicable to NFS4 ACLs.
+mask entry. This option is not applicable to NFSv4 ACLs.
.It Fl x Ar entries | position
If
.Ar entries
@@ -258,8 +258,8 @@
For more details see the examples below.
Default ACLs can be created by using
.Fl d .
-.Sh NFS4 ACL ENTRIES
-An NFS4 ACL entry contains four or five colon-separated fields: an ACL tag,
+.Sh NFSv4 ACL ENTRIES
+An NFSv4 ACL entry contains four or five colon-separated fields: an ACL tag,
an ACL qualifier (only for
.Dq Li user
and
@@ -351,7 +351,7 @@
.Ql #
is ignored (comments).
.Pp
-NFS4 ACL entries are evaluated in their visible order.
+NFSv4 ACL entries are evaluated in their visible order.
.Pp
Multiple ACL entries specified on the command line are
separated by commas.
@@ -376,7 +376,7 @@
.Pp
.Dl setfacl -m owner@:rwxp::allow,g:mail:rwp::allow file
.Pp
-Semantically equal to the example above, but for NFS4 ACL.
+Semantically equal to the example above, but for NFSv4 ACL.
.Pp
.Dl setfacl -M file1 file2
.Pp
@@ -393,7 +393,7 @@
.Pp
.Dl setfacl -x0 file
.Pp
-Remove the first entry from the NFS4 ACL from
+Remove the first entry from the NFSv4 ACL from
.Pa file .
.Pp
.Dl setfacl -bn file
==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#15 (text+ko) ====
@@ -247,7 +247,7 @@
if (pathconf(file->filename, _PC_EXTENDED_SECURITY_NP)) {
if (acl_type == ACL_TYPE_DEFAULT) {
warnx("%s: there are no default entries "
- "in NFS4 ACLs", file->filename);
+ "in NFSv4 ACLs", file->filename);
continue;
}
@@ -281,7 +281,7 @@
break;
case OP_REMOVE_DEF:
if (acl_type == ACL_TYPE_NFS4) {
- warnx("%s: there are no default entries in NFS4 ACLs; "
+ warnx("%s: there are no default entries in NFSv4 ACLs; "
"cannot remove", file->filename);
local_error++;
break;
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_add_perm.3#5 (text+ko) ====
@@ -58,7 +58,7 @@
.It ACL_READ Read permission
.El
.Pp
-For NFS4 ACLs, valid values are:
+For NFSv4 ACLs, valid values are:
.Pp
.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
.It ACL_READ_DATA Read permission
@@ -88,7 +88,7 @@
ACL_ADD_FILE, ACL_APPEND_DATA, ACL_ADD_SUBDIRECTORY, ACL_READ_NAMED_ATTRS,
ACL_WRITE_NAMED_ATTRS, ACL_DELETE_CHILD, ACL_READ_ATTRIBUTES,
ACL_WRITE_ATTRIBUTES, ACL_DELETE, ACL_READ_ACL, ACL_WRITE_ACL
-or ACL_SYNCHRONIZE brands the ACL as NFS4.
+or ACL_SYNCHRONIZE brands the ACL as NFSv4.
.Sh RETURN VALUES
.Rv -std acl_add_perm
.Sh ERRORS
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_branding.c#12 (text+ko) ====
@@ -36,14 +36,14 @@
/*
* An ugly detail of the implementation - fortunately not visible
* to the API users - is the "branding": libc needs to keep track
- * of what "brand" ACL is, wheather it's NFS4, POSIX or unknown.
+ * of what "brand" ACL is, wheather it's NFSv4, POSIX.1e or unknown.
* It happens automatically - for example, during acl_get_file(3) ACL
* gets branded according to the "type" argument, during acl_set_permset
- * ACL, if its brand is unknown gets branded as NFS4 if any of the
- * NFS4 permissions that are not valid for POSIX ACL are set etc.
+ * ACL, if its brand is unknown gets branded as NFSv4 if any of the
+ * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc.
* Branding information is used for printing out the ACL (acl_to_text(3)),
* veryfying acl_set_whatever arguments (checking against setting
- * bits that are valid only for NFS4 in ACL branded as POSIX) etc.
+ * bits that are valid only for NFSv4 in ACL branded as POSIX.1e) etc.
*/
static acl_t
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get.3#4 (text+ko) ====
@@ -99,7 +99,7 @@
.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
.It ACL_TYPE_ACCESS POSIX.1e access ACL
.It ACL_TYPE_DEFAULT POSIX.1e default ACL
-.It ACL_TYPE_NFS4 NFS4 ACL
+.It ACL_TYPE_NFS4 NFSv4 ACL
.El
.Pp
The ACL returned will be branded accordingly.
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_brand_np.3#5 (text+ko) ====
@@ -50,10 +50,10 @@
.Fa acl .
.Pp
Branding is an internal mechanism intended to prevent mixing POSIX.1e
-and NFS4 entries by mistake.
+and NFSv4 entries by mistake.
It's also used by the libc to determine how to print out the ACL.
-The first call to function that is specific for one particular brand - POSIX
-or NFS4 - "brands" the ACL.
+The first call to function that is specific for one particular brand - POSIX.1e
+or NFSv4 - "brands" the ACL.
After that, calling function specific to another brand will result in error.
.Sh RETURN VALUES
.Rv -std acl_get_brand_np
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_entry_type_np.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm acl_get_entry_type_np
-.Nd retrieve the ACL type from an NFS4 ACL entry
+.Nd retrieve the ACL type from an NFSv4 ACL entry
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -42,7 +42,7 @@
The
.Fn acl_get_entry_type_np
function
-is a non-portable call that returns the ACL type for the NFS4 ACL entry
+is a non-portable call that returns the ACL type for the NFSv4 ACL entry
.Fa entry_d .
Upon successful completion, the location referred to by the argument
.Fa entry_type_p
@@ -58,7 +58,7 @@
.It Bq Er EINVAL
Argument
.Fa entry_d
-is not a valid descriptor for an NFS4 ACL entry;
+is not a valid descriptor for an NFSv4 ACL entry;
.El
.Sh SEE ALSO
.Xr acl 3 ,
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_get_flagset_np.3#4 (text+ko) ====
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm acl_get_flagset_np
-.Nd retrieve flagset from an NFS4 ACL entry
+.Nd retrieve flagset from an NFSv4 ACL entry
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_is_trivial_np.3#5 (text+ko) ====
@@ -56,7 +56,7 @@
any access rules.
For POSIX.1e ACLs, ACL is trivial if it has the three required entries,
one for owner, one for owning group, and one for other.
-For NFS4 ACLs, ACL is trivial if it has the "canonical six" entries.
+For NFSv4 ACLs, ACL is trivial if it has the "canonical six" entries.
Files that have non-trivial ACL have a plus sign appended after mode bits
in "ls -l" output.
.Sh RETURN VALUES
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set.3#4 (text+ko) ====
@@ -83,13 +83,13 @@
.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
.It ACL_TYPE_ACCESS POSIX.1e access ACL
.It ACL_TYPE_DEFAULT POSIX.1e default ACL
-.It ACL_TYPE_NFS4 NFS4 ACL
+.It ACL_TYPE_NFS4 NFSv4 ACL
.El
.Pp
Trying to set ACL_TYPE_NFS4 with
.Va acl
-branded as POSIX, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL
-branded as NFS4, will result in error.
+branded as POSIX.1e, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL
+branded as NFSv4, will result in error.
.Sh IMPLEMENTATION NOTES
.Fx Ns 's
support for POSIX.1e interfaces and features is still under
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_entry_type_np.3#4 (text+ko) ====
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm acl_set_entry_type_np
-.Nd set NFS4 ACL entry type
+.Nd set NFSv4 ACL entry type
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -54,7 +54,7 @@
.It ACL_ENTRY_TYPE_DENY "deny" type entry
.El
.Pp
-This call brands the ACL as NFS4.
+This call brands the ACL as NFSv4.
.Sh RETURN VALUES
.Rv -std acl_set_entry_type_np
.Sh ERRORS
@@ -69,7 +69,7 @@
The value pointed to by
.Fa entry_type
is not valid.
-ACL is already branded as POSIX.
+ACL is already branded as POSIX.1e.
.It Bq Er ENOMEM
The value to be returned requires more memory than is allowed
by the hardware or system-imposed memory management constraints.
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_flagset_np.3#4 (text+ko) ====
@@ -30,7 +30,7 @@
.Os
.Sh NAME
.Nm acl_set_flagset_np
-.Nd set the flags of an NFS4 ACL entry
+.Nd set the flags of an NFSv4 ACL entry
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
@@ -47,7 +47,7 @@
with the flags contained in
.Fa flagset_d .
.Pp
-This call brands the ACL as NFS4.
+This call brands the ACL as NFSv4.
.Sh RETURN VALUES
.Rv -std acl_set_flagset_np
.Sh ERRORS
@@ -59,7 +59,7 @@
Argument
.Fa entry_d
is not a valid descriptor for an ACL entry.
-ACL is already branded as POSIX.
+ACL is already branded as POSIX.1e.
.El
.Sh SEE ALSO
.Xr acl 3 ,
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_set_tag_type.3#5 (text+ko) ====
@@ -64,8 +64,8 @@
.Fn acl_set_tag_type
with
.Fa tag_type
-equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX.
-Calling it with ACL_EVERYONE brands the ACL as NFS4.
+equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX.1e.
+Calling it with ACL_EVERYONE brands the ACL as NFSv4.
.Sh RETURN VALUES
.Rv -std acl_set_tag_type
.Sh ERRORS
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_support.c#9 (text+ko) ====
@@ -426,7 +426,7 @@
/*
* Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
- * counterpart. It's neccessary for the old (pre-NFS4 ACLs) binaries
+ * counterpart. It's neccessary for the old (pre-NFSv4 ACLs) binaries
* to work with new libc and kernel. Fixing 'type' for old binaries with
* old libc and new kernel is being done by kern/vfs_acl.c:type_unold().
*/
==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.3#4 (text+ko) ====
@@ -56,9 +56,9 @@
is not NULL, then the function shall return the length of the string (not
including the NULL terminator) in the location pointed to by
.Va len_p .
-If the ACL is POSIX, the format of the text string returned by
+If the ACL is POSIX.1e, the format of the text string returned by
.Fn acl_to_text
-shall be the POSIX.1e long ACL form. If the ACL is NFS4, the format
+shall be the POSIX.1e long ACL form. If the ACL is NFSv4, the format
of the text string shall be the compact form, unless the
.Va ACL_TEXT_VERBOSE
flag is given.
==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#6 (text+ko) ====
@@ -190,7 +190,7 @@
for more information, which cause the multilabel mount flag to be set
automatically at mount-time.
.It Cm nfs4acls
-Enable NFS4 ACLS, which can be customized via the
+Enable NFSv4 ACLS, which can be customized via the
.Xr setfacl 1
and
.Xr getfacl 1
==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vaccess_acl_nfs4.9#4 (text+ko) ====
@@ -30,7 +30,7 @@
.Dt VACCESS_ACL_NFS4 9
.Sh NAME
.Nm vaccess_acl_nfs4
-.Nd generate a NFS4 ACL access control decision using vnode parameters
+.Nd generate a NFSv4 ACL access control decision using vnode parameters
.Sh SYNOPSIS
.In sys/param.h
.In sys/vnode.h
@@ -49,7 +49,7 @@
This call implements the logic for the
.Ux
discretionary file security model
-with NFS4 ACL extensions.
+with NFSv4 ACL extensions.
It accepts the vnodes type
.Fa type ,
owning UID
@@ -86,7 +86,7 @@
.Pp
The algorithm used by
.Fn vaccess_acl_nfs4
-is based on the NFS4 ACL evaluation algorithm, as described in
+is based on the NFSv4 ACL evaluation algorithm, as described in
NFSv4 Minor Version 1, draft-ietf-nfsv4-minorversion1-21.txt.
The algorithm selects a
.Em matching
@@ -125,5 +125,5 @@
was written by
.An Edward Tomasz Napierala Aq trasz at FreeBSD.org .
.Sh BUGS
-This manual page should include a full description of the NFS4 ACL
+This manual page should include a full description of the NFSv4 ACL
evaluation algorithm, or cross reference another page that does.
==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#26 (text+ko) ====
@@ -4832,7 +4832,7 @@
return (EINVAL);
/*
- * With NFS4 ACLs, chmod(2) may need to add additional entries,
+ * With NFSv4 ACLs, chmod(2) may need to add additional entries,
* splitting every entry into two and appending "canonical six"
* entries at the end. Don't allow for setting an ACL that would
* cause chmod(2) to run out of ACL entries.
==== //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#5 (text+ko) ====
@@ -695,7 +695,7 @@
if (nfsrv_useacl == 0 || !NFSHASNFS4ACL(vnode_mount(vp)))
return (NFSERR_ATTRNOTSUPP);
/*
- * With NFS4 ACLs, chmod(2) may need to add additional entries.
+ * With NFSv4 ACLs, chmod(2) may need to add additional entries.
* Make sure it has enough room for that - splitting every entry
* into two and appending "canonical six" entries at the end.
* Cribbed out of kern/vfs_acl.c - Rick M.
==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_acl.c#18 (text+ko) ====
@@ -175,7 +175,7 @@
/*
* Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
- * counterpart. It's required for old (pre-NFS4 ACLs) libc to work
+ * counterpart. It's required for old (pre-NFSv4 ACLs) libc to work
* with new kernel. Fixing 'type' for old binaries with new libc
* is being done in lib/libc/posix1e/acl_support.c:_acl_type_unold().
*/
@@ -219,7 +219,7 @@
goto out;
/*
- * With NFS4 ACLs, chmod(2) may need to add additional entries.
+ * With NFSv4 ACLs, chmod(2) may need to add additional entries.
* Make sure it has enough room for that - splitting every entry
* into two and appending "canonical six" entries at the end.
*/
@@ -325,7 +325,7 @@
goto out;
/*
- * With NFS4 ACLs, chmod(2) may need to add additional entries.
+ * With NFSv4 ACLs, chmod(2) may need to add additional entries.
* Make sure it has enough room for that - splitting every entry
* into two and appending "canonical six" entries at the end.
*/
==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#37 (text+ko) ====
@@ -134,7 +134,7 @@
* Kernel code should use the "type" argument passed
* to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls;
* ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e
- * ACL, ACL_TYPE_NFS4 means NFS4 ACL.
+ * ACL, ACL_TYPE_NFS4 means NFSv4 ACL.
*/
int ats_brand;
};
==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#27 (text+ko) ====
@@ -317,7 +317,7 @@
#define VAPPEND 000000040000 /* permission to write/append */
/*
* VEXPLICIT_DENY makes VOP_ACCESS(9) return EPERM or EACCES only
- * if permission was denied explicitly, by a "deny" rule in NFS4 ACL,
+ * if permission was denied explicitly, by a "deny" rule in NFSv4 ACL,
* and 0 otherwise. This never happens with ordinary unix access rights
* or POSIX.1e ACLs. Obviously, VEXPLICIT_DENY must be OR-ed with
* some other V* constant.
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/fuzzer.sh#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-# This is an NFS4 ACL fuzzer. It expects to be run by non-root
-# in a scratch directory on a filesystem with NFS4 ACLs support.
+# This is an NFSv4 ACL fuzzer. It expects to be run by non-root
+# in a scratch directory on a filesystem with NFSv4 ACLs support.
# It generates the output that is expected to be fed to
# /usr/src/tools/regression/acltools/run script.
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-crossfs.test#2 (text+ko) ====
@@ -4,7 +4,7 @@
# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test
#
# You need to have three subdirectories, named nfs4, posix and none,
-# with filesystems with NFS4 ACLs, POSIX ACLs and no ACLs enabled,
+# with filesystems with NFSv4 ACLs, POSIX.1e ACLs and no ACLs enabled,
# respectively, mounted on them, in your current directory.
#
# WARNING: Creates files in unsafe way.
@@ -36,7 +36,7 @@
$ ls -l posix/xxx | cut -d' ' -f1
> -r--r-xrw-
-# mv with POSIX ACLs.
+# mv with POSIX.1e ACLs.
$ setfacl -m u:42:x,g:43:w posix/xxx
$ rm -f posix/yyy
$ mv posix/xxx posix/yyy
@@ -48,10 +48,10 @@
> mask::rwx
> other::rw-
-# mv from POSIX to NFS4.
+# mv from POSIX.1e to NFSv4.
$ rm -f nfs4/xxx
$ mv posix/yyy nfs4/xxx
-> mv: ACL brand of source is POSIX, but destination is NFS4; ACL not copied
+> mv: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied
$ getfacl -nq nfs4/xxx
> owner@:-wxp----------:------:deny
> owner@:r------A-W-Co-:------:allow
@@ -60,7 +60,7 @@
> everyone@:--x----A-W-Co-:------:deny
> everyone@:rw-p--a-R-c--s:------:allow
-# mv with NFS4 ACLs.
+# mv with NFSv4 ACLs.
$ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx
$ rm -f nfs4/yyy
$ mv nfs4/xxx nfs4/yyy
@@ -74,20 +74,20 @@
> everyone@:--x----A-W-Co-:------:deny
> everyone@:rw-p--a-R-c--s:------:allow
-# mv from NFS4 to POSIX.
+# mv from NFSv4 to POSIX.1e.
$ rm -f posix/xxx
$ mv nfs4/yyy posix/xxx
-> mv: ACL brand of source is NFS4, but destination is POSIX; ACL not copied
+> mv: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied
$ ls -l posix/xxx | cut -d' ' -f1
> -r--rwxrw-
-# mv from POSIX to none.
+# mv from POSIX.1e to none.
$ setfacl -m u:42:x,g:43:w posix/xxx
$ mv posix/xxx none/xxx
$ ls -l none/xxx | cut -d' ' -f1
> -r--rwxrw-
-# cp with POSIX ACLs.
+# cp with POSIX.1e ACLs.
$ rm -f posix/xxx
$ touch posix/xxx
$ setfacl -m u:42:x,g:43:w posix/xxx
@@ -116,14 +116,14 @@
> mask::rwx
> other::r--
-# mv from POSIX to NFS4.
+# mv from POSIX.1e to NFSv4.
$ rm -f nfs4/xxx
$ cp -p posix/xxx nfs4/xxx
-> cp: ACL brand of source is POSIX, but destination is NFS4; ACL not copied
+> cp: ACL brand of source is POSIX.1e, but destination is NFSv4; ACL not copied
$ ls -l nfs4/xxx | cut -d' ' -f1
> -rw-rwxr--
-# cp with NFS4 ACLs.
+# cp with NFSv4 ACLs.
$ setfacl -a0 u:42:x:allow,g:43:w:allow nfs4/xxx
$ rm -f nfs4/yyy
$ cp -p nfs4/xxx nfs4/yyy
@@ -137,10 +137,10 @@
> everyone@:-wxp---A-W-Co-:------:deny
> everyone@:r-----a-R-c--s:------:allow
-# mv from NFS4 to POSIX.
+# mv from NFSv4 to POSIX.1e.
$ rm -f posix/xxx
$ cp -p nfs4/xxx posix/xxx
-> cp: ACL brand of source is NFS4, but destination is POSIX; ACL not copied
+> cp: ACL brand of source is NFSv4, but destination is POSIX.1e; ACL not copied
$ ls -l posix/xxx | cut -d' ' -f1
> -rw-rwxr--
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# This is a tools-level test for NFS4 ACL functionality. Run it as root
+# This is a tools-level test for NFSv4 ACL functionality. Run it as root
# using ACL-enabled kernel:
#
# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories"
+desc="NFSv4 granular permissions checking - WRITE_DATA vs APPEND_DATA on directories"
dir=`dirname $0`
. ${dir}/../misc.sh
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES"
+desc="NFSv4 granular permissions checking - ACL_READ_ATTRIBUTES and ACL_WRITE_ATTRIBUTES"
dir=`dirname $0`
. ${dir}/../misc.sh
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL"
+desc="NFSv4 granular permissions checking - ACL_READ_ACL and ACL_WRITE_ACL"
dir=`dirname $0`
. ${dir}/../misc.sh
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - DELETE and DELETE_CHILD"
+desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD"
dir=`dirname $0`
. ${dir}/../misc.sh
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - ACL_WRITE_OWNER"
+desc="NFSv4 granular permissions checking - ACL_WRITE_OWNER"
dir=`dirname $0`
. ${dir}/../misc.sh
==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
-desc="NFS4 granular permissions checking - DELETE and DELETE_CHILD with directories"
+desc="NFSv4 granular permissions checking - DELETE and DELETE_CHILD with directories"
dir=`dirname $0`
. ${dir}/../misc.sh
More information about the p4-projects
mailing list