aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-05-09 07:46:44 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-05-09 07:46:44 +0000
commitb7c90f028d5f80dace468aa29c5dd3768f021042 (patch)
treeb406e250e82e001c1ce8ab52e551326ecafa9b10
parenteeb2177a2873ae2fdd9929e81c0b2bb8c3e3056e (diff)
downloadsrc-b7c90f028d5f80dace468aa29c5dd3768f021042.tar.gz
src-b7c90f028d5f80dace468aa29c5dd3768f021042.zip
s/ssh_host_key/ssh_host_rsa_key/ since that is what openssh uses now
after a mergemaster.
Notes
Notes: svn path=/head/; revision=76400
-rw-r--r--etc/network.subr4
-rw-r--r--etc/rc.d/netoptions4
-rw-r--r--etc/rc.d/network14
-rw-r--r--etc/rc.d/network24
-rw-r--r--etc/rc.d/network34
-rw-r--r--etc/rc.d/routing4
-rw-r--r--etc/rc.network4
7 files changed, 14 insertions, 14 deletions
diff --git a/etc/network.subr b/etc/network.subr
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';
diff --git a/etc/rc.network b/etc/rc.network
index fbe8bf3692e9..26e3df09b873 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -720,9 +720,9 @@ network_pass3() {
case ${sshd_enable} in
[Yy][Ee][Ss])
- if [ ! -f /etc/ssh/ssh_host_key ]; then
+ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
echo ' creating ssh RSA host key';
- /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key
+ /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key
fi
if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
echo ' creating ssh DSA host key';