git: b1f80dfac968 - main - Revert "nfscommon: Return NFSERR_ATTRNOTSUPP for AUDIT/ALARM ACEs"

The branch main has been updated by rmacklem:

URL: https://cgit.FreeBSD.org/src/commit/?id=b1f80dfac96803d7095d73d8331321ce43fa7917

commit b1f80dfac96803d7095d73d8331321ce43fa7917
Author:     Rick Macklem <rmacklem@FreeBSD.org>
AuthorDate: 2022-01-11 16:26:42 +0000
Commit:     Rick Macklem <rmacklem@FreeBSD.org>
CommitDate: 2022-01-11 16:26:42 +0000

    Revert "nfscommon: Return NFSERR_ATTRNOTSUPP for AUDIT/ALARM ACEs"
    
    This reverts commit f10dc28ec21db60cf1faa3c4b445c4065e760dba.
    
    The client should still be able to getfacl
    audit and alarm ACEs, for non-FreeBSD NFSv4 servers.
    
    A patch that only disables audit/alarm for the server
    side will be committed to replace this patch.
---
 sys/fs/nfs/nfs_commonacl.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c
index 057efdfbc29c..e3583b273db8 100644
--- a/sys/fs/nfs/nfs_commonacl.c
+++ b/sys/fs/nfs/nfs_commonacl.c
@@ -158,13 +158,10 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep,
 			acep->ae_entry_type = ACL_ENTRY_TYPE_ALLOW;
 		else if (acetype == NFSV4ACE_DENIEDTYPE)
 			acep->ae_entry_type = ACL_ENTRY_TYPE_DENY;
-#ifdef notnow
-		/* FreeBSD does not support Audit/Alarm ACEs at this time. */
 		else if (acetype == NFSV4ACE_AUDITTYPE)
 			acep->ae_entry_type = ACL_ENTRY_TYPE_AUDIT;
 		else if (acetype == NFSV4ACE_ALARMTYPE)
 			acep->ae_entry_type = ACL_ENTRY_TYPE_ALARM;
-#endif
 		else
 			aceerr = NFSERR_ATTRNOTSUPP;
 	}