Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/etc/rc.d Sync this with rev 1.8.



details:   https://anonhg.NetBSD.org/src/rev/f8867c39e98c
branches:  netbsd-1-5
changeset: 489569:f8867c39e98c
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Sep 29 05:45:54 2000 +0000

description:
Sync this with rev 1.8.

diffstat:

 etc/rc.d/sshd |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (60 lines):

diff -r 459c623afabf -r f8867c39e98c etc/rc.d/sshd
--- a/etc/rc.d/sshd     Fri Sep 29 05:43:36 2000 +0000
+++ b/etc/rc.d/sshd     Fri Sep 29 05:45:54 2000 +0000
@@ -1,22 +1,23 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.5.2.2 2000/08/09 19:09:46 lukem Exp $
+# $NetBSD: sshd,v 1.5.2.3 2000/09/29 05:45:54 thorpej Exp $
 #
 
-# PROVIDE: ssh
-# REQUIRE: NETWORK
+# PROVIDE: sshd
+# REQUIRE: LOGIN
 
 . /etc/rc.subr
 
 name="sshd"
-command="/usr/sbin/sshd"
-required_files="/etc/sshd.conf"
+rcvar=$name
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="/etc/${name}.conf"
+extra_commands="keygen reload"
 
-extra_commands="keygen"
-
-sshd_keygen() {
-       if [ -f /etc/ssh_host_key ]
-       then
+sshd_keygen()
+{
+       if [ -f /etc/ssh_host_key ]; then
                echo "You already have an RSA host key in /etc/ssh_host_key"
                echo "Skipping RSA Key Generation"
        else
@@ -24,8 +25,7 @@
                /usr/bin/ssh-keygen -b 1024 -f /etc/ssh_host_key -N ''
        fi
 
-       if [ -f /etc/ssh_host_dsa_key ]
-       then
+       if [ -f /etc/ssh_host_dsa_key ]; then
                echo "You already have a DSA host key in /etc/ssh_host_dsa_key"
                echo "Skipping DSA Key Generation"
        else
@@ -34,9 +34,9 @@
        fi
 }
 
-sshd_precmd() {
-       if [ ! -f /etc/ssh_host_key -o ! -f /etc/ssh_host_dsa_key ]
-       then
+sshd_precmd()
+{
+       if [ ! -f /etc/ssh_host_key -o ! -f /etc/ssh_host_dsa_key ]; then
                /etc/rc.d/sshd keygen
        fi
 }



Home | Main Index | Thread Index | Old Index