From nobody Sun Sep 28 09:14:34 2025 X-Original-To: dev-commits-src-main@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 4cZJYR0m24z68MBJ; Sun, 28 Sep 2025 09:14:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZJYQ6hRFz3FtN; Sun, 28 Sep 2025 09:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759050875; 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=KzfiUaWorrE19mBkvAnsJLbskeGVm5P3JXn7ZHqkMc4=; b=xfUxu4oMkNeXHDWxizVfDT1GawH/vBU2MW/mRpH32xRmS7gF2WrWEPkafXotPKBh9Eb46+ KbdjGpZ0+iFvOo842bNAsyYaqy3VTnc/vwoZTsVCrOrMtIgXoiuGM5lXiAb+FHJIBZ1Lav KrRlqICv/s699Sujy55WhkacYO3d6LXT/Umjo7CS+4LfEqicQsyE4d9MEe84RffpdvDV8h XNzJKFO1XWeq8eEEMeukusl1dzTBNh0haOsuJ/7YeMI/Mt8SlukIy81TtwfouV+Nx3JMkQ 9ojwB7kj8UVpIecxA3vkRLZOgyPBVJocXuYhBf1L9n79i1KIMdWpWtvSJcDqxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759050875; 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=KzfiUaWorrE19mBkvAnsJLbskeGVm5P3JXn7ZHqkMc4=; b=hHPTEGoeDt+3/McA8nRq1oxVPR+RiJJf1po2a2HnOpVKNehIuPMbGqjR8Th/GO4jKl3l8H BcPhX6h9Pv14sqJLokRfuEdkTamqAEErUeCD7yqqW7KmP8JzV6BGT9zclfYsIzThKhRHy3 p8fTBu74w1xIas0S7dLLujI8cuXLq6VzcY5memsjzMEhnAMy/YPYz/dK1ksFJnThUdQfmr 2dRJrUGsNzjd7fgxMWknLmY6tP9N9P07NOrsoltYu5w+A1iPEyc5W5ia++hp+d87Ua82cl vTlsihcX6GHEg1I4WdKMkii/CLeEQUwEp7L5lNYII3bMa8EiqByOfhTWUvfUEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759050875; a=rsa-sha256; cv=none; b=kdDjdqcXNtv1PXjM8mnXL1d0MZR7hhTIKWL8p0ZeL4X/LoCSUWgKafqLHw3QCVzKIh8Twg bFvJL4d6HeEuTjo2cjOL3WEdnkJh06LqyCt43mfJafX+HrAcrQoup2MtcIR6JRmiFqzvVs sNHuunkXAWNvD9+ivVMV4bP8ii6kBeRanyxqSnJOxoXsaRtSAm960l+Epw5OFo4gx+pBHH grJKqA228e+P3hpwYy1RVO0GSDrFKxAolMd4mzf0fEp+iIukadu4/jN+75Bz/1xa1yK+gg khRH2wZS2w6BS+92LHKMXCkQ9f/YikWl3bRyYn8wd9nnH8IITgbv3ASO2FAXfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cZJYQ60qSz1BqR; Sun, 28 Sep 2025 09:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58S9EYXp006097; Sun, 28 Sep 2025 09:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58S9EYgc006094; Sun, 28 Sep 2025 09:14:34 GMT (envelope-from git) Date: Sun, 28 Sep 2025 09:14:34 GMT Message-Id: <202509280914.58S9EYgc006094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 2872ced18742 - main - rc.d: Fix ftpd flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2872ced18742aaf9480c9a43059cba7e24dd7e59 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=2872ced18742aaf9480c9a43059cba7e24dd7e59 commit 2872ced18742aaf9480c9a43059cba7e24dd7e59 Author: Jose Luis Duran AuthorDate: 2025-09-28 09:12:41 +0000 Commit: Jose Luis Duran CommitDate: 2025-09-28 09:12:41 +0000 rc.d: Fix ftpd flags After f99f0ee14e3a ("rc.d: add a service jails config to all base system services"), the FTP service ignores the flags configured in ftpd_flags: # sysrc ftpd_flags=-B ftpd_flags: -> -B # service ftpd enable ftpd enabled in /etc/rc.conf # service ftpd start Starting ftpd. # pgrep -fl ftpd 1234 /usr/libexec/ftpd -D Notice the absence of the "-B" flag. PR: 285600 Reviewed by: 0mp, emaste Approved by: emaste (mentor) Fixes: f99f0ee14e3a ("rc.d: add a service jails config to all base system services") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D52745 --- libexec/rc/rc.d/ftpd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/ftpd b/libexec/rc/rc.d/ftpd index e25a561a520a..5a4fd49e36f1 100755 --- a/libexec/rc/rc.d/ftpd +++ b/libexec/rc/rc.d/ftpd @@ -12,12 +12,11 @@ name="ftpd" desc="Internet File Transfer Protocol daemon" rcvar="ftpd_enable" command="/usr/libexec/${name}" +command_args="-D" pidfile="/var/run/${name}.pid" : ${ftpd_svcj_options:="net_basic"} load_rc_config $name -flags="-D ${flags} ${rc_flags}" - run_rc_command "$1"