aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2011-03-06 20:12:09 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2011-03-06 20:12:09 +0000
commit8a6f49852203604b7f5746e905375ab7c66943da (patch)
treedf85bb4b8f7bc526314b363c3d4de0de43d56cde /sys
parentde555084834b10902e8333fdd76c93fa6f71be03 (diff)
downloadsrc-8a6f49852203604b7f5746e905375ab7c66943da.tar.gz
src-8a6f49852203604b7f5746e905375ab7c66943da.zip
Temporarily revert r219272; it breaks acl_is_trivial_np(3).
Notes
Notes: svn path=/head/; revision=219348
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/subr_acl_nfs4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_acl_nfs4.c b/sys/kern/subr_acl_nfs4.c
index b7dd52df8654..9b758a11d55c 100644
--- a/sys/kern/subr_acl_nfs4.c
+++ b/sys/kern/subr_acl_nfs4.c
@@ -55,12 +55,12 @@ void acl_nfs4_trivial_from_mode(struct acl *aclp, mode_t mode);
#endif /* !_KERNEL */
-static int acl_nfs4_old_semantics = 0;
+static int acl_nfs4_old_semantics = 1;
#ifdef _KERNEL
SYSCTL_INT(_vfs, OID_AUTO, acl_nfs4_old_semantics, CTLFLAG_RW,
- &acl_nfs4_old_semantics, 0, "Use pre-PSARC/2010/029 NFSv4 ACL semantics");
+ &acl_nfs4_old_semantics, 1, "Use pre-PSARC/2010/029 NFSv4 ACL semantics");
static struct {
accmode_t accmode;