From bad2f716f4d3453fb9156b603cfaca44ea30fa31 Mon Sep 17 00:00:00 2001
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Date: Tue, 28 Jun 2022 15:13:39 +0200
Subject: [PATCH] ftp: Use /var/spool/ftp as ftp's home consistently

The home directory of the ftp user is /var/spool/ftp according to
hier(7). Update the manual page of ftpd(8) to reflect that.

MFC after:	2 weeks
---
 libexec/ftpd/ftpd.8   | 7 +++++--
 share/man/man7/hier.7 | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 0cd62899189..868acac6169 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -28,7 +28,7 @@
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2010
+.Dd June 28, 2022
 .Dt FTPD 8
 .Os
 .Sh NAME
@@ -436,7 +436,7 @@ uses its left-hand side as the name of the directory to do
 .Xr chroot 2
 to, and its right-hand side to change the current directory to afterwards.
 A typical example for this case would be
-.Pa /usr/local/ftp/./pub .
+.Pa /var/spool/ftp/./pub .
 In order that system security is not breached, it is recommended
 that the
 .Dq ftp
@@ -555,6 +555,9 @@ Displayed and access refused.
 Log file for anonymous transfers.
 .It Pa /var/log/xferlog
 Default place for session logs.
+.It Pa /var/spool/ftp
+Recommended directory for the FTP root directory
+(the home directory of the ftp user).
 .El
 .Sh SEE ALSO
 .Xr ftp 1 ,
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 93a7a86ec76..0696033878f 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -893,7 +893,9 @@ undelivered submission mail queue;
 see
 .Xr sendmail 8
 .It Pa ftp/
-commonly ~ftp; the anonymous ftp root directory
+ftp root directory;
+see
+.Xr ftpd 8
 .It Pa mqueue/
 undelivered mail queue;
 see