diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-04-19 04:00:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-04-19 04:00:16 +0000 |
| commit | a740a7ee419da8bede2c53b37eeed1c18134394e (patch) | |
| tree | c3ee585d3669b1d1f23345a224dd66deb69576e6 /etc | |
| parent | e5deb0bd0bec5f3a5340f2a264470098be748bf8 (diff) | |
permit passing sshd flags; djm
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.166 2001/04/01 19:39:54 deraadt Exp $ +# $OpenBSD: rc,v 1.167 2001/04/19 04:00:15 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -505,8 +505,8 @@ if [ "X${mopd_flags}" != X"NO" -a -d /tftpboot/mop ]; then echo -n ' mopd'; mopd ${mopd_flags} fi -if [ X"${sshd}" == X"YES" ]; then - /usr/sbin/sshd; echo -n ' sshd' +if [ X"${sshd_flags}" != X"NO" ]; then + /usr/sbin/sshd ${sshd_flags}; echo -n ' sshd' fi echo '.' diff --git a/etc/rc.conf b/etc/rc.conf index 142b482b149..d195e4700f4 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.56 2001/03/25 22:20:22 krw Exp $ +# $OpenBSD: rc.conf,v 1.57 2001/04/19 04:00:15 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -9,6 +9,7 @@ mrouted_flags=NO # for normal use: "", if activated rarpd_flags=NO # for normal use: "-a" bootparamd_flags=NO # for normal use: "" rbootd_flags=NO # for normal use: "" +sshd_flags="" # for normal use: "" sendmail_flags="-q30m" # for normal use: "-bd -q30m" smtpfwdd_flags=NO # for normal use: "", and no "-bd" above. named_flags=NO # for normal use: "" @@ -55,7 +56,6 @@ portmap=YES # almost always needed inetd=YES # almost always needed lpd=NO # printing daemons check_quotas=YES # NO may be desirable in some YP environments -sshd=YES # if YES, run sshd ntpd=YES # run ntpd if it exists afs=NO # mount and run afs |