[src/trunk]: src/etc Add command_args="-D" to the ftpd rc.d script. This flag...

[peter <peter%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a347fcce30e5
branches:  trunk
changeset: 583491:a347fcce30e5
user:      peter <peter%NetBSD.org@localhost>
date:      Tue Aug 09 14:59:33 2005 +0000

description:
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.

diffstat:

 etc/defaults/rc.conf |  4 ++--
 etc/rc.d/ftpd        |  7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r 4d9b092607e6 -r a347fcce30e5 etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Tue Aug 09 13:58:44 2005 +0000
+++ b/etc/defaults/rc.conf      Tue Aug 09 14:59:33 2005 +0000
@@ -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 --
 #      default configuration of /etc/rc.conf
@@ -196,7 +196,7 @@
 lpd=NO                 lpd_flags="-s"          # -s "secure" unix domain only
 sshd=NO                        sshd_flags=""
 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
 # smmsp binary.  In the former case, you must not have the file
diff -r 4d9b092607e6 -r a347fcce30e5 etc/rc.d/ftpd
--- a/etc/rc.d/ftpd     Tue Aug 09 13:58:44 2005 +0000
+++ b/etc/rc.d/ftpd     Tue Aug 09 14:59:33 2005 +0000
@@ -1,21 +1,18 @@
 #!/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
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-#
-#      Note that ftpd_flags should always contain the flag "-D", otherwise
-#      ftpd(8) will not start.
-#
 
 $_rc_subr_loaded . /etc/rc.subr
 
 name="ftpd"
 rcvar=$name
 command="/usr/libexec/${name}"
+command_args="-D"
 pidfile="/var/run/${name}.pid"
 
 load_rc_config $name