Add command_args="-D" to the ftpd rc.d script. This flag is always needed

when running ftpd as daemon and it will now automatically be appended to the
command line, even if ftpd_flags doesn't have it.

Suggested by Alan Barrett and Luke Mewburn, thanks.
This commit is contained in:
peter 2005-08-09 14:59:33 +00:00
parent b779ac8673
commit c9c458f33c
2 changed files with 4 additions and 7 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: rc.conf,v 1.67 2005/08/08 00:20:46 peter Exp $ # $NetBSD: rc.conf,v 1.68 2005/08/09 14:59:33 peter Exp $
# #
# /etc/defaults/rc.conf -- # /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf # default configuration of /etc/rc.conf
@ -196,7 +196,7 @@ postfix=NO
lpd=NO lpd_flags="-s" # -s "secure" unix domain only lpd=NO lpd_flags="-s" # -s "secure" unix domain only
sshd=NO sshd_flags="" sshd=NO sshd_flags=""
ssh_keygen_flags="-b 1024" # generate 1024 bit keys if host keys missing ssh_keygen_flags="-b 1024" # generate 1024 bit keys if host keys missing
ftpd=NO ftpd_flags="-D -ll" ftpd=NO ftpd_flags="-ll"
# sendmail can now be run either as a suid root binary or as a sgid # sendmail can now be run either as a suid root binary or as a sgid
# smmsp binary. In the former case, you must not have the file # smmsp binary. In the former case, you must not have the file

View File

@ -1,21 +1,18 @@
#!/bin/sh #!/bin/sh
# #
# $NetBSD: ftpd,v 1.2 2005/08/08 00:19:37 peter Exp $ # $NetBSD: ftpd,v 1.3 2005/08/09 14:59:33 peter Exp $
# #
# PROVIDE: ftpd # PROVIDE: ftpd
# REQUIRE: LOGIN # REQUIRE: LOGIN
# KEYWORD: shutdown # KEYWORD: shutdown
#
# Note that ftpd_flags should always contain the flag "-D", otherwise
# ftpd(8) will not start.
#
$_rc_subr_loaded . /etc/rc.subr $_rc_subr_loaded . /etc/rc.subr
name="ftpd" name="ftpd"
rcvar=$name rcvar=$name
command="/usr/libexec/${name}" command="/usr/libexec/${name}"
command_args="-D"
pidfile="/var/run/${name}.pid" pidfile="/var/run/${name}.pid"
load_rc_config $name load_rc_config $name