From nobody Tue Jan 11 16:29:58 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 100AE193979D; Tue, 11 Jan 2022 16:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYGPf4QzSz3N7G; Tue, 11 Jan 2022 16:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49CA51C4C6; Tue, 11 Jan 2022 16:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20BGTwvE052595; Tue, 11 Jan 2022 16:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BGTwgx052594; Tue, 11 Jan 2022 16:29:58 GMT (envelope-from git) Date: Tue, 11 Jan 2022 16:29:58 GMT Message-Id: <202201111629.20BGTwgx052594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b1f80dfac968 - main - Revert "nfscommon: Return NFSERR_ATTRNOTSUPP for AUDIT/ALARM ACEs" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1f80dfac96803d7095d73d8331321ce43fa7917 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641918598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejKxTbf30EbjHDpSZoQeyar9z2gq5Mjzp4W9/nbKA9Y=; b=snwQ52MEgxrroEwZx3YcwswXIlDVRQXUyMJ/N2EmDBTCMxrjeRsZQz3/9AvzxUFV4faRtx x78WY8voUUKfqxF+AeiMtvheugJy+cIUFFhdGgNbW9Z2vL6v1IIHr2zMv49e7EB0xrbLG9 JnZq7JUPi86owCp+jr3hJUzFsXM+ZdH7LwQHjiP0MoShJI8nuOxhXd5PS1NL7zDaSpD8UF KX2FNMwby2EoWepdtSTuD4MGMKS9bGNBKXRrfVYWUXto30LLSjEBWV6kCn68KMdxG/30FM S6GaniVa9OpCK3ty5At1u0AOTsnwClaRnNzKHn8ylhoKLi1BpWguOnvxe4ml2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641918598; a=rsa-sha256; cv=none; b=rbSUA4rELBDP2PwzeEECueTVoXeerKxJ5XXNHMRVjwMUecI0sqYsvnZVY04JVPtEPVLBGa lC4rTwbovZA+LJjKM/P+RpeD9kz/gAI3uhTQncFLWf0Mz0+hFAbpr6bRivKWI38CygvigW Y3ZOlpR1rXBuuTunvmDCpeI1tmVZgX/QkP7AFet8fKjw9NfeOsTIHZxMJP/eegE66JusZ6 wacMX8ZR7RCyPZESoGjOs/5imDnwNjtyjECS8rtF6SEQzd357fFOygGFm0Mqz3FgVusfs1 15rOa4Sh3z9c12Cr6+d/H1e1bVip4B2WC+mV0h/2FFHM55Q2LtEYwsc4IbLLSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b1f80dfac96803d7095d73d8331321ce43fa7917 commit b1f80dfac96803d7095d73d8331321ce43fa7917 Author: Rick Macklem AuthorDate: 2022-01-11 16:26:42 +0000 Commit: Rick Macklem 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; }