From owner-dev-commits-src-main@freebsd.org Thu Dec 24 22:23:00 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F39A84D3A05; Thu, 24 Dec 2020 22:23:00 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D24Mm5b7sz3Q2Y; Thu, 24 Dec 2020 22:23:00 +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 B26D9181F0; Thu, 24 Dec 2020 22:23:00 +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 0BOMN0hA090106; Thu, 24 Dec 2020 22:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BOMN0p1090105; Thu, 24 Dec 2020 22:23:00 GMT (envelope-from git) Date: Thu, 24 Dec 2020 22:23:00 GMT Message-Id: <202012242223.0BOMN0p1090105@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: 79302a6304b1 - mount_nfs(8): add a description for the new "tlscertname" option 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: 79302a6304b1074bdb8ca60cb29982cf64197c92 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 22:23:01 -0000 The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=79302a6304b1074bdb8ca60cb29982cf64197c92 commit 79302a6304b1074bdb8ca60cb29982cf64197c92 Author: Rick Macklem AuthorDate: 2020-12-24 22:20:06 +0000 Commit: Rick Macklem CommitDate: 2020-12-24 22:20:06 +0000 mount_nfs(8): add a description for the new "tlscertname" option commit 665b1365fe8e added a new NFS mount option that is used to set a non-default X.509 certificate, that can be used for nfs-over-tls NFS mounts. This patch adds a description for it to the man page. Reviewed by: 0mp Differential Revision: https://reviews.freebsd.org/D27733 --- sbin/mount_nfs/mount_nfs.8 | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 44490d6945fe..b2c561bc5cc8 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd November 30, 2020 +.Dd December 21, 2020 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -418,6 +418,36 @@ per RFC NNNN. TLS is only supported for TCP connections and the .Xr rpc.tlsclntd 8 daemon must be running for an NFS over TCP connection to use TLS. +.It Cm tlscertname Ns = Ns Aq Ar name +This option specifies the name of an alternate certificate to be +presented to the NFS server during TLS handshake. +The default certificate file names are +.Dq cert.pem +and +.Dq certkey.pem . +When this option is specified, +.Ar name +replaces +.Dq cert +in the above file names. +For example, if the value of +.Ar name +is specified as +.Dq other +the certificate file names to be used will be +.Dq other.pem +and +.Dq otherkey.pem . +These files are stored in +.Pa /etc/rpc.tlsclntd +by default. +This option is only meaningful when used with the +.Cm tls +option and the +.Xr rpc.tlsclntd 8 +is running with the +.Fl m +command line flag set. .It Cm udp Use UDP transport. .It Cm vers Ns = Ns Aq Ar vers_number