SF.net SVN: gar:[23032] csw/mgar/pkg/openssh/trunk/files

[chninkel at users.sourceforge.net]

Revision: 23032
          http://sourceforge.net/p/gar/code/23032
Author:   chninkel
Date:     2014-02-17 11:19:27 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
openssh/trunk: fixed host keys generation

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW
    csw/mgar/pkg/openssh/trunk/files/cswopenssh
    csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2014-02-17 11:19:27 UTC (rev 23032)
@@ -1,3 +1,10 @@
+openssh (6.5p1,REV=2014.02.17) unstable
+
+  * Fixed the host key generation script so that keys for all
+  types are always generared (closes: #5151)
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 17 Feb 2014 12:10:39 +0100
+
 openssh (6.5p1,REV=2014.01.31) unstable
 
   * New upstream release.

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2014-02-17 11:19:27 UTC (rev 23032)
@@ -17,12 +17,7 @@
 case $1 in 
 'start')
         if [ -x /opt/csw/bin/ssh-keygen ]; then
-		for ALGO in rsa dsa ecdsa; do
-			if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
-				echo "Creating new ${ALGO} public/private host key pair"
-				ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N ''
-			fi
-		done
+		ssh-keygen -A 
         fi
 
         [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-16 20:43:05 UTC (rev 23031)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2014-02-17 11:19:27 UTC (rev 23032)
@@ -5,12 +5,7 @@
 KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/cswsshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
-	for ALGO in rsa dsa ecdsa; do
-		if [ ! -f "$KEYDIR/ssh_host_${ALGO}_key" ]; then
-			echo "Creating new ${ALGO} public/private host key pair"
-			ssh-keygen -f $KEYDIR/ssh_host_${ALGO}_key -t ${ALGO} -N ''
-		fi
-	done
+	ssh-keygen -A
 fi
 
 /opt/csw/sbin/sshd

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.