From 918221515eb9b2b81a0e9e30f75f0557fce5082a Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 19 Mar 2002 03:45:02 +0000
Subject: Don't try to generate ssh keys if ssh isn't installed.

---
 etc/network.subr | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'etc/network.subr')

diff --git a/etc/network.subr b/etc/network.subr
index 59f5370..eabdd0b 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -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
-- 
cgit v1.1