Module Name: src
Committed By: christos
Date: Wed Oct 23 14:45:38 UTC 2019
Modified Files:
src/etc/rc.d: sshd
Log Message:
simplify more (from rudolf)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/etc/rc.d/sshd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/sshd
diff -u src/etc/rc.d/sshd:1.29 src/etc/rc.d/sshd:1.30
--- src/etc/rc.d/sshd:1.29 Sat May 26 15:18:11 2018
+++ src/etc/rc.d/sshd Wed Oct 23 10:45:38 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sshd,v 1.29 2018/05/26 19:18:11 riastradh Exp $
+# $NetBSD: sshd,v 1.30 2019/10/23 14:45:38 christos Exp $
#
# PROVIDE: sshd
@@ -20,7 +20,7 @@ sshd_keygen()
(
keygen="/usr/bin/ssh-keygen"
umask 022
- while read type bits filename version name; do
+ while read type bits filename; do
f="/etc/ssh/$filename"
if [ -f "$f" ]; then
continue
@@ -33,10 +33,10 @@ sshd_keygen()
"${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' -q && \
printf "ssh-keygen: " && "${keygen}" -f "${f}" -l
done << _EOF
-dsa 1024 ssh_host_dsa_key 2 DSA
-ecdsa 521 ssh_host_ecdsa_key 1 ECDSA
-ed25519 -1 ssh_host_ed25519_key 1 ED25519
-rsa 0 ssh_host_rsa_key 2 RSA
+dsa 1024 ssh_host_dsa_key
+ecdsa 521 ssh_host_ecdsa_key
+ed25519 -1 ssh_host_ed25519_key
+rsa 0 ssh_host_rsa_key
_EOF
)
}
