CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: snj
Date: Mon Dec 28 16:02:34 UTC 2020
Modified Files:
src/etc/rc.d [netbsd-8]: ntpdate
Log Message:
Pull up following revision(s) (requested by martin in ticket #1643):
etc/rc.d/ntpdate: revision 1.21
Adjust to "pool" usage in our standard ntp.conf, pointed out
by Connor McLaughlan.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.40.1 src/etc/rc.d/ntpdate
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/ntpdate
diff -u src/etc/rc.d/ntpdate:1.20 src/etc/rc.d/ntpdate:1.20.40.1
--- src/etc/rc.d/ntpdate:1.20 Mon Aug 3 18:43:48 2009
+++ src/etc/rc.d/ntpdate Mon Dec 28 16:02:33 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpdate,v 1.20 2009/08/03 18:43:48 perry Exp $
+# $NetBSD: ntpdate,v 1.20.40.1 2020/12/28 16:02:33 snj Exp $
#
# PROVIDE: ntpdate
@@ -21,7 +21,7 @@ ntpdate_start()
ntpdate_hosts=$(awk '
/^#/{ next }
/^(server|peer)[ \t]*127.127/ { next }
- /^(server|peer)/ { if ($2 ~ /^-[46]/)
+ /^(server|peer|pool)/ { if ($2 ~ /^-[46]/)
print $3
else
print $2 }
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src Committed By: snj Date: Mon Dec 28 16:02:34 UTC 2020 Modified Files: src/etc/rc.d [netbsd-8]: ntpdate Log Message: Pull up following revision(s) (requested by martin in ticket #1643): etc/rc.d/ntpdate: revision 1.21 Adjust to "pool" usage in our standard ntp.conf, pointed out by Connor McLaughlan. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.40.1 src/etc/rc.d/ntpdate Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:11:49 UTC 2018
Modified Files:
src/etc/rc.d [netbsd-8]: sshd
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.23.8.2 -r1.23.8.3 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.23.8.2 src/etc/rc.d/sshd:1.23.8.3
--- src/etc/rc.d/sshd:1.23.8.2 Sun Dec 10 09:44:48 2017
+++ src/etc/rc.d/sshd Thu Jun 7 16:11:49 2018
@@ -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 @@ sshd_keygen()
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
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src Committed By: martin Date: Thu Jun 7 16:11:49 UTC 2018 Modified Files: src/etc/rc.d [netbsd-8]: sshd Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.23.8.2 -r1.23.8.3 src/etc/rc.d/sshd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: snj
Date: Sun Dec 10 09:44:49 UTC 2017
Modified Files:
src/etc/rc.d [netbsd-8]: sshd
Log Message:
Pull up following revision(s) (requested by sevan in ticket #420):
etc/rc.d/sshd: revision 1.25
Do away with (not well specified, even if it happens to work) absurd
15 arg test ([ ]) expression, and replace it with several well defined
2 arg tests, combined with (also well defined) sh syntax.
To generate a diff of this commit:
cvs rdiff -u -r1.23.8.1 -r1.23.8.2 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.23.8.1 src/etc/rc.d/sshd:1.23.8.2
--- src/etc/rc.d/sshd:1.23.8.1 Mon Dec 4 10:59:46 2017
+++ src/etc/rc.d/sshd Sun Dec 10 09:44:48 2017
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sshd,v 1.23.8.1 2017/12/04 10:59:46 snj Exp $
+# $NetBSD: sshd,v 1.23.8.2 2017/12/10 09:44:48 snj Exp $
#
# PROVIDE: sshd
@@ -45,10 +45,10 @@ _EOF
sshd_precmd()
{
- 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
+ if ! [ -f /etc/ssh/ssh_host_dsa_key ] ||
+ ! [ -f /etc/ssh/ssh_host_ecdsa_key ] ||
+ ! [ -f /etc/ssh/ssh_host_ed25519_key ] ||
+ ! [ -f /etc/ssh/ssh_host_rsa_key ]; then
run_rc_command keygen
fi
}
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src Committed By: snj Date: Sun Dec 10 09:44:49 UTC 2017 Modified Files: src/etc/rc.d [netbsd-8]: sshd Log Message: Pull up following revision(s) (requested by sevan in ticket #420): etc/rc.d/sshd: revision 1.25 Do away with (not well specified, even if it happens to work) absurd 15 arg test ([ ]) expression, and replace it with several well defined 2 arg tests, combined with (also well defined) sh syntax. To generate a diff of this commit: cvs rdiff -u -r1.23.8.1 -r1.23.8.2 src/etc/rc.d/sshd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: snj
Date: Mon Dec 4 10:59:46 UTC 2017
Modified Files:
src/etc/rc.d [netbsd-8]: sshd
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.8.1 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.23 src/etc/rc.d/sshd:1.23.8.1
--- src/etc/rc.d/sshd:1.23 Sun Oct 19 16:33:01 2014
+++ src/etc/rc.d/sshd Mon Dec 4 10:59:46 2017
@@ -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 @@ sshd_keygen()
"${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 @@ _EOF
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
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src Committed By: snj Date: Mon Dec 4 10:59:46 UTC 2017 Modified Files: src/etc/rc.d [netbsd-8]: sshd Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.8.1 src/etc/rc.d/sshd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
