From nobody Tue Jul 12 08:40:10 2022 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 E91031CFB014; Tue, 12 Jul 2022 08:40:10 +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 4LhvMZ3sfmz3NB0; Tue, 12 Jul 2022 08:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657615210; 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=gB0XZrl/vwhtqlpctuN/bcLhj6oQJU9s4QQFkdprvEA=; b=O5Y4/kSHcb0WuK9qUePQd7KdmK/JYVjcs0S3Lv8pOpw6XAhzJ8e3f+xpYwSWit/854bjex X73wh59GrmEjz7uvNM53AUSEOsHlFHb3hwEZ6TNGe1rh9RTGsfuvridYzWzdS7elIvh9Ko M9AgFpqKtozkjOZMTTxtuYbdAzRgAykV0Vg9Nk3SDGbCWxCAAXkQI/KOxyATKgn17SIW5m aG/CLH9VBRzDr8xb+EBlypttaVigK1yF4qlfzRJ2NVB35k+Sfvyymne/gL1PemL1C/fLgK J+nw/5Tn6GfsPR91IoFyDa+j8AVrGv85fvs9PjM2hVZ0iUHrXRIrugFeS666Aw== 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 4LhvMZ2yWbzdCX; Tue, 12 Jul 2022 08:40:10 +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 26C8eA1d039350; Tue, 12 Jul 2022 08:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26C8eAej039348; Tue, 12 Jul 2022 08:40:10 GMT (envelope-from git) Date: Tue, 12 Jul 2022 08:40:10 GMT Message-Id: <202207120840.26C8eAej039348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e9ef7a1fb36b - stable/12 - ftp: Use /var/spool/ftp as ftp's home consistently 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e9ef7a1fb36b96cdaa43a37b65927104da3547e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657615210; 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=gB0XZrl/vwhtqlpctuN/bcLhj6oQJU9s4QQFkdprvEA=; b=oZhXr0WSFbXti4EYaZJF9uupdc0NcA200MEK4BCZJNGoIxafVvU/qy7hOYH0qtTkDWFJR7 0og6qs/PQpXrGvSmtl2rlO25SbU/HNVuIZilknlIjx7jNXQiSceIqJZXUyLOOgBgNffCOr oUKmcw5JNHXebccuuXlWMRrVrp4qglcQ8RR78dhSagaEIOmF3oBNBVSay5GAE7qOVYXAlH RDaAYfIRvoL3/vXCWRRb1tEqVS2aIGVKMJw5JtBEyj8/mP6c54qXlVJRhkqatKwgqSu5eQ vzomoQa+s5nsenLKUIN4VocQ/C/TENYKQxxtP5emhOXrg9L3+Xn3nbfrF4fhoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657615210; a=rsa-sha256; cv=none; b=euuonvmRuZaq/yYM29IpXloHSHMaFmdpqHp1WVEgFQ4VWUb8RNxXZ5qwKQZKY4rsZnIVRS QneNA9VNs9+IDPJyANeHGTwVmC0XGkShSFocjeYUoFy+JxPWHKQtswWKRxVCKjfMwSlVb+ awiphTaCliFdJj65MPb/oaBCzYG8hFfJ86VMVYI08Gn481c3N/tSBbu9GOXHq3gFV0u5tw vijxuXo2FYqS7PcpQZ94qhvBtufz4YsROXS2B5o/DFVXnDzqYhL94eXbW20aNl701QUvEx uUFZ4pXy89jflHK3ORyCeDxFdmYuhB9nHIGbubweWJ3z4J2R0wN1UnTJDzWm9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e9ef7a1fb36b96cdaa43a37b65927104da3547e5 commit e9ef7a1fb36b96cdaa43a37b65927104da3547e5 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-06-28 13:13:39 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-12 08:39:50 +0000 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 (cherry picked from commit bad2f716f4d3453fb9156b603cfaca44ea30fa31) --- 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 0cd62899189c..868acac61699 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 69010dde8e9e..65dd79e24eb2 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -872,7 +872,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