From owner-svn-src-projects@freebsd.org Sun Mar 22 18:35:13 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 6E2E72693CC for ; Sun, 22 Mar 2020 18:35:13 +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 48lmQn0FZPz3Mfc; Sun, 22 Mar 2020 18:35:13 +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 0F8B61B1E; Sun, 22 Mar 2020 18:35:12 +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 02MIZBwi086050; Sun, 22 Mar 2020 18:35:11 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02MIZBfO086049; Sun, 22 Mar 2020 18:35:11 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202003221835.02MIZBfO086049@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:35:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r359221 - projects/nfs-over-tls/usr.sbin/mountd X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/usr.sbin/mountd X-SVN-Commit-Revision: 359221 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:35:13 -0000 Author: rmacklem Date: Sun Mar 22 18:35:11 2020 New Revision: 359221 URL: https://svnweb.freebsd.org/changeset/base/359221 Log: Add the "-tls" and "-tlscert" export options to mountd.c. Unfortunately, flags in the export structure is an int and not a uint64_t, so I had to hack around that. This needs to be fixed properly. Modified: projects/nfs-over-tls/usr.sbin/mountd/mountd.c Modified: projects/nfs-over-tls/usr.sbin/mountd/mountd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/mountd/mountd.c Sun Mar 22 18:27:28 2020 (r359220) +++ projects/nfs-over-tls/usr.sbin/mountd/mountd.c Sun Mar 22 18:35:11 2020 (r359221) @@ -1482,7 +1482,7 @@ get_exportlist_one(int passno) */ has_host = FALSE; anon = def_anon; - exflags = MNT_EXPORTED; + exflags = MNTEX_EXPORTED; got_nondir = 0; opt_flags = 0; ep = (struct exportlist *)NULL; @@ -1868,7 +1868,7 @@ get_exportlist(int passno) LOGDEBUG("doing passno=0"); /* * Clear flag that notes if a public fh has been exported. - * It is set by do_mount() if MNT_EXPUBLIC is set for the entry. + * It is set by do_mount() if MNTEX_PUBLIC is set for the entry. */ has_publicfh = 0; @@ -2697,14 +2697,14 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e } } if (!strcmp(cpopt, "ro") || !strcmp(cpopt, "o")) { - *exflagsp |= MNT_EXRDONLY; + *exflagsp |= MNTEX_RDONLY; } else if (cpoptarg && (!strcmp(cpopt, "maproot") || !(allflag = strcmp(cpopt, "mapall")) || !strcmp(cpopt, "root") || !strcmp(cpopt, "r"))) { usedarg++; parsecred(cpoptarg, cr); if (allflag == 0) { - *exflagsp |= MNT_EXPORTANON; + *exflagsp |= MNTEX_EXPORTANON; opt_flags |= OP_MAPALL; } else opt_flags |= OP_MAPROOT; @@ -2737,9 +2737,9 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e } else if (!strcmp(cpopt, "alldirs")) { opt_flags |= OP_ALLDIRS; } else if (!strcmp(cpopt, "public")) { - *exflagsp |= MNT_EXPUBLIC; + *exflagsp |= MNTEX_PUBLIC; } else if (!strcmp(cpopt, "webnfs")) { - *exflagsp |= (MNT_EXPUBLIC|MNT_EXRDONLY|MNT_EXPORTANON); + *exflagsp |= (MNTEX_PUBLIC|MNTEX_RDONLY|MNTEX_EXPORTANON); opt_flags |= OP_MAPALL; } else if (cpoptarg && !strcmp(cpopt, "index")) { ep->ex_indexfile = strdup(cpoptarg); @@ -2750,6 +2750,10 @@ do_opt(char **cpp, char **endcpp, struct exportlist *e return (1); opt_flags |= OP_SEC; usedarg++; + } else if (!strcmp(cpopt, "tls")) { + *exflagsp |= MNTEX_TLS; + } else if (!strcmp(cpopt, "tlscert")) { + *exflagsp |= MNTEX_TLSCERT; } else { syslog(LOG_ERR, "bad opt %s", cpopt); return (1); @@ -3139,7 +3143,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, * If this is the public directory, get the file handle * and load it into the kernel via the nfssvc() syscall. */ - if ((exflags & MNT_EXPUBLIC) != 0) { + if ((exflags & MNTEX_PUBLIC) != 0) { fhandle_t fh; char *public_name;