From owner-svn-src-projects@freebsd.org Sun Mar 22 18:41:52 2020 Return-Path: Delivered-To: svn-src-projects@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 93F76269619 for ; Sun, 22 Mar 2020 18:41:52 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) 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 48lmZS3JGQz3yJj; Sun, 22 Mar 2020 18:41:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6663D1CCA; Sun, 22 Mar 2020 18:41:52 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02MIfqGd088704; Sun, 22 Mar 2020 18:41:52 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MIfqRE088703; Sun, 22 Mar 2020 18:41:52 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202003221841.02MIfqRE088703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 22 Mar 2020 18:41:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r359222 - projects/nfs-over-tls/sys/sys X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/sys X-SVN-Commit-Revision: 359222 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 18:41:52 -0000 Author: rmacklem Date: Sun Mar 22 18:41:51 2020 New Revision: 359222 URL: https://svnweb.freebsd.org/changeset/base/359222 Log: Hack around 32bit flags in the export_args structure by (re)defining the export flags under MNTEX_ instead of MNT_. It retains the bits already used, but allows others that are MNT_xxx bits not used in export_args to be defined for export_args. This might be a rasonable workaround? Modified: projects/nfs-over-tls/sys/sys/mount.h Modified: projects/nfs-over-tls/sys/sys/mount.h ============================================================================== --- projects/nfs-over-tls/sys/sys/mount.h Sun Mar 22 18:35:11 2020 (r359221) +++ projects/nfs-over-tls/sys/sys/mount.h Sun Mar 22 18:41:51 2020 (r359222) @@ -361,6 +361,22 @@ void __mnt_vnode_markerfree_lazy(struct vnode MNT_AUTOMOUNTED | MNT_UNTRUSTED) /* + * Export flags that are only set/used in the ex_flags field and + * not in mnt_flag. Since some are defined as MNT_EXxxx above, + * these ones are just redefined here. + * MNT_EXPORTED must remain and be set/cleared in mnt_flag. + * The others defined as MNT_xxx should probably remain for + * compatibility with old versions of mountd, etc. + */ +#define MNTEX_TLS 0x0000000000000001ULL /* TLS RPC required */ +#define MNTEX_TLSCERT 0x0000000000000002ULL /* verified certificate req */ +#define MNTEX_EXPORTED MNT_EXPORTED /* filesystem exported */ +#define MNTEX_RDONLY MNT_EXRDONLY /* exported read only */ +#define MNTEX_EXPORTANON MNT_EXPORTANON /* anon uid mapping for all */ +#define MNTEX_KERB MNT_EXKERB /* exported with Kerberos */ +#define MNTEX_PUBLIC MNT_EXPUBLIC /* public export (WebNFS) */ + +/* * External filesystem command modifier flags. * Unmount can use the MNT_FORCE flag. * XXX: These are not STATES and really should be somewhere else.