Author: trasz
Date: Tue May 26 17:01:00 2009
New Revision: 192818
URL: http://svn.freebsd.org/changeset/base/192818
Log:
Adapt to the new ACL #define names.
Reviewed by: rmacklem@
Modified:
head/sys/fs/nfs/nfs_commonacl.c
Modified: head/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonacl.c Tue May 26 16:35:05 2009
(r192817)
+++ head/sys/fs/nfs/nfs_commonacl.c Tue May 26 17:01:00 2009
(r192818)
@@ -66,7 +66,7 @@ nfsrv_dissectace(struct nfsrv_descript *
acep->ae_tag = ACL_UNDEFINED_TAG;
acep->ae_id = ACL_UNDEFINED_ID;
acep->ae_perm = (acl_perm_t)0;
- acep->ae_extended = ACL_EXTENDED_DENY;
+ acep->ae_entry_type = ACL_ENTRY_TYPE_DENY;
if (acesizep)
*acesizep = 4 * NFSX_UNSIGNED;
return (0);
@@ -128,11 +128,11 @@ nfsrv_dissectace(struct nfsrv_descript *
}
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;
@@ -143,16 +143,16 @@ nfsrv_dissectace(struct nfsrv_descript *
acep->ae_flags |= ACL_ENTRY_FAILED_ACCESS;
}
/*
- * Set ae_extended.
+ * Set ae_entry_type.
*/
if (acetype == NFSV4ACE_ALLOWEDTYPE)
- acep->ae_extended = ACL_EXTENDED_ALLOW;
+ acep->ae_entry_type = ACL_ENTRY_TYPE_ALLOW;
else if (acetype == NFSV4ACE_DENIEDTYPE)
- acep->ae_extended = ACL_EXTENDED_DENY;
+ acep->ae_entry_type = ACL_ENTRY_TYPE_DENY;
else if (acetype == NFSV4ACE_AUDITTYPE)
- acep->ae_extended = ACL_EXTENDED_AUDIT;
+ acep->ae_entry_type = ACL_ENTRY_TYPE_AUDIT;
else if (acetype == NFSV4ACE_ALARMTYPE)
- acep->ae_extended = ACL_EXTENDED_ALARM;
+ acep->ae_entry_type = ACL_ENTRY_TYPE_ALARM;
else
aceerr = NFSERR_ATTRNOTSUPP;
}
@@ -466,11 +466,11 @@ nfsrv_buildace(struct nfsrv_descript *nd
/*
* Fill in the ace type.
*/
- if (ace->ae_extended & ACL_EXTENDED_ALLOW)
+ if (ace->ae_entry_type & ACL_ENTRY_TYPE_ALLOW)
acetype = NFSV4ACE_ALLOWEDTYPE;
- else if (ace->ae_extended & ACL_EXTENDED_DENY)
+ else if (ace->ae_entry_type & ACL_ENTRY_TYPE_DENY)
acetype = NFSV4ACE_DENIEDTYPE;
- else if (ace->ae_extended & ACL_EXTENDED_AUDIT)
+ else if (ace->ae_entry_type & ACL_ENTRY_TYPE_AUDIT)
acetype = NFSV4ACE_AUDITTYPE;
else
acetype = NFSV4ACE_ALARMTYPE;
@@ -483,9 +483,9 @@ nfsrv_buildace(struct nfsrv_descript *nd
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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
