Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/etc/rc.d Pull up following revision(s) (requested by jmcn...
details: https://anonhg.NetBSD.org/src/rev/77df98b6430d
branches: netbsd-8
changeset: 851751:77df98b6430d
user: martin <martin%NetBSD.org@localhost>
date: Thu Jun 07 16:11:49 2018 +0000
description:
Pull up following revision(s) (requested by jmcneill in ticket #838):
etc/rc.d/sshd: revision 1.28
Silence ssh-keygen output when host keys are generated. Instead, print only
key fingerprints. This replaces dozens of lines out ASCII art output with
something more reasonable:
armv7# service sshd start
ssh-keygen: 1024 SHA256:ynP4BQ2B0Fknnf9PfF4QoUDlYi0+7rNfYXTOYP2cDic root@armv7 (DSA)
ssh-keygen: 521 SHA256:Eoj382aaJNlSxuq/aYj3AXgxfMJAkyVPoCQd2BNjJiA root@armv7 (ECDSA)
ssh-keygen: 256 SHA256:+e9/qTbbN/g6xvkadtHsmIQ+Pc0afZRxbXJsk2HKIzY root@armv7 (ED25519)
ssh-keygen: 2048 SHA256:urNaF/m6oiCe5hXFZBxGLW2PvLz0ibtRFrqYw6R+qTw root@armv7 (RSA)
ssh-keygen: 256 SHA256:Su2Nal2W3vrFz8ukpcSXngl1/bu6xUm1nSvbxTHe9Js root@armv7 (XMSS)
Starting sshd.
diffstat:
etc/rc.d/sshd | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r 5a668643286c -r 77df98b6430d etc/rc.d/sshd
--- a/etc/rc.d/sshd Thu Jun 07 16:05:09 2018 +0000
+++ b/etc/rc.d/sshd Thu Jun 07 16:11:49 2018 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sshd,v 1.23.8.2 2017/12/10 09:44:48 snj Exp $
+# $NetBSD: sshd,v 1.23.8.3 2018/06/07 16:11:49 martin Exp $
#
# PROVIDE: sshd
@@ -32,7 +32,8 @@
0) bitarg="${ssh_keygen_flags}";;
*) bitarg="-b ${bits}";;
esac
- "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
+ "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' -q && \
+ printf "ssh-keygen: " && "${keygen}" -f "${f}" -l
fi
done << _EOF
dsa 1024 ssh_host_dsa_key 2 DSA
Home |
Main Index |
Thread Index |
Old Index