diff options
author | obrien <obrien@FreeBSD.org> | 2001-05-18 18:10:02 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2001-05-18 18:10:02 +0000 |
commit | bac609c202ccd3f77baec4e2cbba8f8c8756af98 (patch) | |
tree | 0125f96978511303285162b8731f736d36084159 /etc/rc.d | |
parent | f6b3b57bdd72c15c5e3c1c930a156b71c42090ee (diff) | |
download | FreeBSD-src-bac609c202ccd3f77baec4e2cbba8f8c8756af98.zip FreeBSD-src-bac609c202ccd3f77baec4e2cbba8f8c8756af98.tar.gz |
Restore the RSA host key to /etc/ssh/ssh_host_key.
Also fix $FreeBSD$ spamage in crypto/openssh/sshd_config rev. 1.16.
Diffstat (limited to 'etc/rc.d')
-rw-r--r-- | etc/rc.d/netoptions | 11 | ||||
-rw-r--r-- | etc/rc.d/network1 | 11 | ||||
-rw-r--r-- | etc/rc.d/network2 | 11 | ||||
-rw-r--r-- | etc/rc.d/network3 | 11 | ||||
-rw-r--r-- | etc/rc.d/routing | 11 |
5 files changed, 15 insertions, 40 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 65e79ae..fbe8bf3 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -720,14 +720,9 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - if [ -f /etc/ssh/ssh_host_key ]; then - /bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key - /bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub - else - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key - fi + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_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 65e79ae..fbe8bf3 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -720,14 +720,9 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - if [ -f /etc/ssh/ssh_host_key ]; then - /bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key - /bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub - else - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key - fi + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_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 65e79ae..fbe8bf3 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -720,14 +720,9 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - if [ -f /etc/ssh/ssh_host_key ]; then - /bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key - /bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub - else - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key - fi + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_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 65e79ae..fbe8bf3 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -720,14 +720,9 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - if [ -f /etc/ssh/ssh_host_key ]; then - /bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key - /bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub - else - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key - fi + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_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 65e79ae..fbe8bf3 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -720,14 +720,9 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then - if [ -f /etc/ssh/ssh_host_key ]; then - /bin/ln -s /etc/ssh/ssh_host_key /etc/ssh/ssh_host_rsa_key - /bin/ln -s /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key.pub - else - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_rsa_key - fi + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key fi if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then echo ' creating ssh DSA host key'; |