[src/netbsd-8]: src/etc/rc.d Pull up following revision(s) (requested by seva...

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

details:   https://anonhg.NetBSD.org/src/rev/024fbdff33fb
branches:  netbsd-8
changeset: 434462:024fbdff33fb
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Dec 04 10:59:46 2017 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #321):
        etc/rc.d/sshd: revision 1.24
Don't try to generate sshv1 keys on new systems.

diffstat:

 etc/rc.d/sshd |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 20f8314c3156 -r 024fbdff33fb etc/rc.d/sshd
--- a/etc/rc.d/sshd     Mon Dec 04 10:55:18 2017 +0000
+++ b/etc/rc.d/sshd     Mon Dec 04 10:59:46 2017 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: sshd,v 1.23 2014/10/19 16:33:01 christos Exp $
+# $NetBSD: sshd,v 1.23.8.1 2017/12/04 10:59:46 snj Exp $
 #
 
 # PROVIDE: sshd
@@ -35,7 +35,6 @@
                        "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
                fi
        done << _EOF
-rsa1   0       ssh_host_key            1       RSA
 dsa    1024    ssh_host_dsa_key        2       DSA
 ecdsa  521     ssh_host_ecdsa_key      1       ECDSA
 ed25519        -1      ssh_host_ed25519_key    1       ED25519
@@ -46,8 +45,7 @@
 
 sshd_precmd()
 {
-       if [ ! -f /etc/ssh/ssh_host_key -o \
-           ! -f /etc/ssh/ssh_host_dsa_key -o \
+       if [ ! -f /etc/ssh/ssh_host_dsa_key -o \
            ! -f /etc/ssh/ssh_host_ecdsa_key -o \
            ! -f /etc/ssh/ssh_host_ed25519_key -o \
            ! -f /etc/ssh/ssh_host_rsa_key ]; then