From nobody Tue Sep 12 16:40:16 2023 X-Original-To: dev-commits-src-branches@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 4RlTpT25lmz4ss0v; Tue, 12 Sep 2023 16:40:17 +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 4RlTpT1hMrz3ZPx; Tue, 12 Sep 2023 16:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536817; 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=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=vHHz4SEH4yEZN0n6aF8Mv8LSi4uFxwMzIB9xD76Am8B0f0ix3uvoftmanXr74dMPC0B5ps EZ2Qpqng7hossb5rPB66P3TFq7bfEb5uYviKtW/QzydnBAsDGvq9wduL3Dg72sBYyoejxi tL5tDUtU7vmlG4wQs8hX90yQje1CiDPio4ruvmr3LtxUXQXhQmCNLP5PvJNRJ5+9cPzYMJ veECP6SLBMH4iWVCTJRFvHX3b4QrolN6xL00j7/iXxURjLkTsOwLUD8dvzqfdBNn9n0nZ5 cXEyZCKuAuQBMPmsmGVVyW8U7gjX/v8L6Hgot4fUwnWDTHpx+lL/My+ipC0Qdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694536817; a=rsa-sha256; cv=none; b=YfBgEmpY+bLAQCZfW2fkZUVIA4OJw3MjPov/audkg0WJq686iX961yRXwOI6YLkI7Xhuyr jmSnK+1GIydJepgTAMhZbnpsa+boizkf2YsW707MQct4hpQ5pPpDFMYJPN8ARthaMjbIjR I7tEdmHEB5CzHBUOqPygraoJGtW4uZjIhG2jyddmiCAGEiMn06wVN72BIuMJbot1bW7wQ5 LDQi9f5PkAQjNZniYCsq2Z83KlQdf/3/GJKAnwqVNfhR4I6LVqtwtz0aihTWbHtuen6DC6 ZZuz2Nfivk17U2ZTNQ+r9DLbY/aSBim3uUr5oLcDypb2FWSALyDGdcDSPMDVfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694536817; 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=I/LqWLdkBsWsY/ezzkYShS4QoVf292BCvN9r9Ly7+eA=; b=IfeTatZpSc/x2pachwX9SrfFF+ske84Qj3RHC70WWsGbKi+sv+v60WvuL8nhTsew0oA2Ep u0U6yEGVd8c/hFQyg1z9VS7DJoTkDP/hBQ6Eq9EwPRXfH8rXhjeqguzA/bIfDjk4g0VwKb LPwlZEguML0w9UqGnk5Lbg76NvQ/m+5OzVTpXNlxH2vb5duHLwdDc+O5Y6mcUVf2rcmlhF Nn5KMbmb+V6xgcOWsE8lTgC8sSkdAmFfnMdlh9JAzzXtJOPegc+xzZjcb0Mg3zu31D4a8W t6wUTnxKxemZfaAgZh2zCSSsimFhMYZ3THfHSu6gEgbLerwRmcol2mq11UYX0A== 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 4RlTpT0djQzfsP; Tue, 12 Sep 2023 16:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38CGeG2P062780; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CGeG8A062775; Tue, 12 Sep 2023 16:40:16 GMT (envelope-from git) Date: Tue, 12 Sep 2023 16:40:16 GMT Message-Id: <202309121640.38CGeG8A062775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 6af462f0ec36 - releng/14.0 - mountd: do not warn about using class mask with -mask List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=6af462f0ec36fd8c2f1a679932e71e4afe438be4 commit 6af462f0ec36fd8c2f1a679932e71e4afe438be4 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-12 16:39:46 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org Approved by: re (gjb) Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 (cherry picked from commit 48514c5724cdf3338dd6d220e5deee6178d7ee48) (cherry picked from commit deaa6984ada80e36aea2f16e5f7211dd0d14800c) --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } }