diff options
| author | trasz <trasz@FreeBSD.org> | 2009-05-26 17:01:00 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2009-05-26 17:01:00 +0000 |
| commit | a08e1f64b1b570a93e8eb5a834e3e1980c1f459d (patch) | |
| tree | 8b2dc6f267a79c5cff2c8c51f564be837d446ea8 /sys/fs | |
| parent | 2864c5d543e6e9084ecdc1a66dab4d64fceed270 (diff) | |
| download | FreeBSD-src-a08e1f64b1b570a93e8eb5a834e3e1980c1f459d.zip FreeBSD-src-a08e1f64b1b570a93e8eb5a834e3e1980c1f459d.tar.gz | |
Adapt to the new ACL #define names.
Reviewed by: rmacklem@
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/nfs/nfs_commonacl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c index 9ebfd32..4ecac8b 100644 --- a/sys/fs/nfs/nfs_commonacl.c +++ b/sys/fs/nfs/nfs_commonacl.c @@ -66,7 +66,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep, 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 *nd, struct acl_entry *acep, } 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 *nd, struct acl_entry *acep, 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, u_char *name, int namelen, /* * 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, u_char *name, int namelen, 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; |
