rpms/openssh/devel openssh.spec,1.181,1.182 sshd.init,1.5,1.6

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6222

Modified Files:
	openssh.spec sshd.init 
Log Message:
Add possibility to autocreate only RSA key into initscript



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/openssh.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- openssh.spec	27 Nov 2009 13:22:15 -0000	1.181
+++ openssh.spec	4 Dec 2009 13:31:18 -0000	1.182
@@ -69,7 +69,7 @@
 Summary: An open source implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: 5.3p1
-Release: 11%{?dist}%{?rescue_rel}
+Release: 12%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -525,6 +525,9 @@ fi
 %endif
 
 %changelog
+* Fri Dec  4 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-12
+- Add possibility to autocreate only RSA key into initscript (#533339)
+
 * Fri Nov 27 2009 Jan F. Chadima <jchadima at redhat.com> - 5.3p1-11
 - Prepare NSS key patch for future SEC_ERROR_LOCKED_PASSWORD (#537411)
 


Index: sshd.init
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/devel/sshd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sshd.init	29 Oct 2009 09:30:48 -0000	1.5
+++ sshd.init	4 Dec 2009 13:31:18 -0000	1.6
@@ -122,9 +122,11 @@ start()
 	[ -f /etc/ssh/sshd_config ] || exit 6
 	# Create keys if necessary
 	if [ "x${AUTOCREATE_SERVER_KEYS}" != xNO ]; then
-		do_rsa1_keygen
 		do_rsa_keygen
-		do_dsa_keygen
+		if [ "x${AUTOCREATE_SERVER_KEYS}" != xRSAONLY ]; then
+			do_rsa1_keygen
+			do_dsa_keygen
+		fi
 	fi
 
 	echo -n $"Starting $prog: "