From owner-dev-commits-src-all@freebsd.org Thu Apr 8 23:12:48 2021 Return-Path: Delivered-To: dev-commits-src-all@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 E39E35C3871; Thu, 8 Apr 2021 23:12:48 +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 4FGcVm61N1z4rSt; Thu, 8 Apr 2021 23:12:48 +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 C1D6F13941; Thu, 8 Apr 2021 23:12:48 +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 138NCmie049240; Thu, 8 Apr 2021 23:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138NCmpu049239; Thu, 8 Apr 2021 23:12:48 GMT (envelope-from git) Date: Thu, 8 Apr 2021 23:12:48 GMT Message-Id: <202104082312.138NCmpu049239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 4934396cd3e6 - stable/12 - Fix the build after 5061d5a0cfaf68a6891db82f6bd26ad3e72e87b1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4934396cd3e6514bbedec11bec4cbb40e4707f53 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 23:12:48 -0000 The branch stable/12 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4934396cd3e6514bbedec11bec4cbb40e4707f53 commit 4934396cd3e6514bbedec11bec4cbb40e4707f53 Author: Alan Somers AuthorDate: 2021-04-08 23:11:00 +0000 Commit: Alan Somers CommitDate: 2021-04-08 23:11:00 +0000 Fix the build after 5061d5a0cfaf68a6891db82f6bd26ad3e72e87b1 A merge conflict in the MFC broke the build. Direct commit to stable/12 because main and stable/13 are unaffected. --- sbin/mount_nullfs/mount_nullfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index 3bb46fdfd66c..cae818c35a49 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -104,7 +104,7 @@ main(int argc, char *argv[]) if (checkpath(argv[1], mountpoint) != 0) err(EX_USAGE, "%s", mountpoint); - if (subdir(target, source) || subdir(source, target)) + if (subdir(target, mountpoint) || subdir(mountpoint, target)) errx(EX_USAGE, "%s (%s) and %s are not distinct paths", argv[0], target, argv[1]);