Date: Thu, 8 Apr 2021 23:12:48 GMT From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4934396cd3e6 - stable/12 - Fix the build after 5061d5a0cfaf68a6891db82f6bd26ad3e72e87b1 Message-ID: <202104082312.138NCmpu049239@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=4934396cd3e6514bbedec11bec4cbb40e4707f53 commit 4934396cd3e6514bbedec11bec4cbb40e4707f53 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2021-04-08 23:11:00 +0000 Commit: Alan Somers <asomers@FreeBSD.org> 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]);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104082312.138NCmpu049239>