openssh: Only attempt keygen on startup

gcwnow · Aug 23, 2012 · d068f36 · d068f36
1 parent b2793b6
commit d068f36
Showing 1 changed file with 34 additions and 34 deletions.
diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd
@@ -3,55 +3,55 @@
 # sshd        Starts sshd.
 #
 
-# Make sure the ssh-keygen progam exists
-[ -f /usr/bin/ssh-keygen ] || exit 0
+umask 077
 
-# Check for the SSH1 RSA key
-if [ ! -f /etc/ssh_host_key ] ; then
-	echo Generating RSA Key...
-	/usr/bin/ssh-keygen -t rsa1 -f /etc/ssh_host_key -C '' -N ''
-fi
+start() {
+	# Make sure the ssh-keygen progam exists
+	[ -f /usr/bin/ssh-keygen ] || exit 0
 
-# Check for the SSH2 RSA key
-if [ ! -f /etc/ssh_host_rsa_key ] ; then
-	echo Generating RSA Key...
-	/usr/bin/ssh-keygen -t rsa -f /etc/ssh_host_rsa_key -C '' -N ''
-fi
+	# Check for the SSH1 RSA key
+	if [ ! -f /etc/ssh_host_key ] ; then
+		echo Generating RSA Key...
+		/usr/bin/ssh-keygen -t rsa1 -f /etc/ssh_host_key -C '' -N ''
+	fi
 
-# Check for the SSH2 DSA key
-if [ ! -f /etc/ssh_host_dsa_key ] ; then
-	echo Generating DSA Key...
-	echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
-	echo
-        /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
-fi
+	# Check for the SSH2 RSA key
+	if [ ! -f /etc/ssh_host_rsa_key ] ; then
+		echo Generating RSA Key...
+		/usr/bin/ssh-keygen -t rsa -f /etc/ssh_host_rsa_key -C '' -N ''
+	fi
 
-# Check for the SSH2 ECDSA key
-if [ ! -f /etc/ssh_host_ecdsa_key ]; then
-	echo Generating ECDSA Key...
-	echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
-	echo
-	/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N ''
-fi
-
-umask 077
+	# Check for the SSH2 DSA key
+	if [ ! -f /etc/ssh_host_dsa_key ] ; then
+		echo Generating DSA Key...
+		echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
+		echo
+		/usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N ''
+	fi
 
-start() {
- 	echo -n "Starting sshd: "
+	# Check for the SSH2 ECDSA key
+	if [ ! -f /etc/ssh_host_ecdsa_key ]; then
+		echo Generating ECDSA Key...
+		echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR!
+		echo
+		/usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N ''
+	fi
+
+	echo -n "Starting sshd: "
 	/usr/sbin/sshd
 	touch /var/lock/sshd
 	echo "OK"
-}	
+}
 stop() {
 	echo -n "Stopping sshd: "
-        killall	sshd 
+        killall	sshd
 	rm -f /var/lock/sshd
-	echo "OK" 
+	echo "OK"
 }
 restart() {
 	stop
 	start
-}	
+}
 
 case "$1" in
   start)