From nobody Tue Sep 30 23:22:02 2025 X-Original-To: dev-commits-src-all@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 4cbvGL25MLz69XTQ; Tue, 30 Sep 2025 23:22:02 +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 4cbvGL1NXXz4BNx; Tue, 30 Sep 2025 23:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759274522; 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=LhXSQA8LhN1A7I6JNTkttZ7wInYYh9B8txDeDoy1DrY=; b=PyDEVl71QG3cSQxLiPWRbDLwoTYD1weW4bCIOx2VmYh4YVGcCAg3X/C0NTq61Tkbt6bvi0 PDnj3tyMUAfjEjmgs8FKoacrGct0ntasuzQN+CvFnMsrpeYOjzN/sjBILtrMyc91csDiSh G+teOnR7nQ4+HXgVyFNr3ZYTLsaoEtVDvmkSOwIoagMkqnQFFkpsNkP6SY8ySuQ57DXEba GMYripYe0F+Dg5cWumsj7na1Ub20aS8KpFx+xf47YpxiYD5BVds1/4P17OLSJVRnZ0kik7 /05c8hg241jRSfIV9W9ii9k6ZegIKAVOK8cxBthJpi6BnItzWOu2wUoMmTOmjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759274522; 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=LhXSQA8LhN1A7I6JNTkttZ7wInYYh9B8txDeDoy1DrY=; b=YaJZDivuTjL+rWWr5FartukkVPN3oJj1dogI76n98YEHYJ/tbdHVrUf1peSeVbvqCwHSBc YfllwQqnE7tpViEdwHDq0OuD9QozLJ8+IYakN0ahGtUCI04zJe50DS1Vh+jM7vVnni4+cv +6VGCsZBGJAgAytSygIxML7QtzAlx1ZaJe+FVfKi+VfAvqB9xKxUq8qauanl5X6437CKqW fpDQC1oB5l67E5uWlVYJMuTXOebqfvbhyEvgpemGMGYDc1k37QdxIqH28R2OtJ0xMFjO6f feG5MSSGcW4DHIaoa3Xlsvgdm0Ub0L3Yk+3mp2gbHMHdkchMzEG4AVoLwWHHrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759274522; a=rsa-sha256; cv=none; b=G1I/tM/GX+TAnN3pomIP3QpgMMMXrN5H6gzdkAWcyN3dfj7GGquVr+mmDZ7CnpZm++OWHX 4zFa2BUtU95sWFViY8SwDpgv1wYVt7xovrLxAS3dCK6iYhkvTz73X/3sZ1WMtgNxeGU5Vv mIcASQrHx4FXjZwyFkhF8gvShzubkqGu9gANzRiHUY5ptr4RDhoQO8C2dDbVLC83rdrDAF pWqWTh/kLD9WNkDaismyJTUn2X4peuXN4chSAL60Gx3/qvdFiHdwmh9WlkVEdMElXS3NXX qZMOAdSWcMMu+q3l5d4mPSgpeyAUfCb1UacOOulWFcfdPwZBWLZM3i3k+5B29g== 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 4cbvGL100xzxjf; Tue, 30 Sep 2025 23:22:02 +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 58UNM2fG050468; Tue, 30 Sep 2025 23:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UNM2Qm050465; Tue, 30 Sep 2025 23:22:02 GMT (envelope-from git) Date: Tue, 30 Sep 2025 23:22:02 GMT Message-Id: <202509302322.58UNM2Qm050465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 8f4e196e7ee7 - stable/15 - rc.d: Fix ftpd flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f4e196e7ee79afdf00f1ca2c41db5dcb7846d22 Auto-Submitted: auto-generated The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=8f4e196e7ee79afdf00f1ca2c41db5dcb7846d22 commit 8f4e196e7ee79afdf00f1ca2c41db5dcb7846d22 Author: Jose Luis Duran AuthorDate: 2025-09-28 09:12:41 +0000 Commit: Jose Luis Duran CommitDate: 2025-09-30 23:15:42 +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 (cherry picked from commit 2872ced18742aaf9480c9a43059cba7e24dd7e59) --- 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"