aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2002-04-11 22:06:27 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2002-04-11 22:06:27 +0000
commitcec161f9e127330e6d43331a4623eff29ad5482d (patch)
tree0acb24277feac80d38f8432c85c73d2274f4c1cf
parent8f8855cff0e106be947544eef80bc09fca52482b (diff)
downloadsrc-cec161f9e127330e6d43331a4623eff29ad5482d.tar.gz
src-cec161f9e127330e6d43331a4623eff29ad5482d.zip
Cosmetic changes to the previous commit, bringing it closer to what I
already had in my tree but didn't want to commit.
Notes
Notes: svn path=/head/; revision=94465
-rw-r--r--etc/network.subr14
-rw-r--r--etc/rc.d/netoptions14
-rw-r--r--etc/rc.d/network114
-rw-r--r--etc/rc.d/network214
-rw-r--r--etc/rc.d/network314
-rw-r--r--etc/rc.d/routing14
-rw-r--r--etc/rc.network14
7 files changed, 49 insertions, 49 deletions
diff --git a/etc/network.subr b/etc/network.subr
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac
diff --git a/etc/rc.network b/etc/rc.network
index d7e8bca3a559..febaf839a3e7 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -853,20 +853,20 @@ network_pass3() {
[Yy][Ee][Ss])
if [ -x /usr/bin/ssh-keygen ]; then
if [ ! -f /etc/ssh/ssh_host_key ]; then
- echo ' creating ssh protocol v1 RSA host key';
+ echo ' creating ssh1 RSA host key';
/usr/bin/ssh-keygen -t rsa1 -N "" \
-f /etc/ssh/ssh_host_key
fi
- if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
- echo ' creating ssh protocol v2 DSA host key';
- /usr/bin/ssh-keygen -t dsa -N "" \
- -f /etc/ssh/ssh_host_dsa_key
- fi
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
- echo ' creating ssh protocol v2 RSA host key';
+ echo ' creating ssh2 RSA host key';
/usr/bin/ssh-keygen -t rsa -N "" \
-f /etc/ssh/ssh_host_rsa_key
fi
+ if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
+ echo ' creating ssh2 DSA host key';
+ /usr/bin/ssh-keygen -t dsa -N "" \
+ -f /etc/ssh/ssh_host_dsa_key
+ fi
fi
;;
esac