Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Sep 2025 09:14:34 GMT
From:      Jose Luis Duran <jlduran@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2872ced18742 - main - rc.d: Fix ftpd flags
Message-ID:  <202509280914.58S9EYgc006094@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=2872ced18742aaf9480c9a43059cba7e24dd7e59

commit 2872ced18742aaf9480c9a43059cba7e24dd7e59
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-09-28 09:12:41 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509280914.58S9EYgc006094>