diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-03-19 03:45:02 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-03-19 03:45:02 +0000 |
| commit | dde1888c4acd54bf2a34b758fb59374e4ef89a73 (patch) | |
| tree | fb406cba80cfbc3725340d39b6a6794b3115a953 /etc/rc.d | |
| parent | 0e3c27aef0c54b1b8d1175eaaa7df6592607388f (diff) | |
| download | src-dde1888c4acd54bf2a34b758fb59374e4ef89a73.tar.gz src-dde1888c4acd54bf2a34b758fb59374e4ef89a73.zip | |
Don't try to generate ssh keys if ssh isn't installed.
Notes
Notes:
svn path=/head/; revision=92638
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/netoptions | 18 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 18 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 18 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 18 | ||||
| -rw-r--r-- | etc/rc.d/routing | 18 |
5 files changed, 55 insertions, 35 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 59f53708c59e..eabdd0b07421 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -847,13 +847,17 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - 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'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 59f53708c59e..eabdd0b07421 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -847,13 +847,17 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - 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'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 59f53708c59e..eabdd0b07421 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -847,13 +847,17 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - 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'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 59f53708c59e..eabdd0b07421 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -847,13 +847,17 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - 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'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 59f53708c59e..eabdd0b07421 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -847,13 +847,17 @@ network_pass3() { case ${sshd_enable} in [Yy][Ee][Ss]) - 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'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac |