rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Modify the init script to prevent it to hang during generating the keys

Browse Source
This commit is contained in:
Jan F. Chadima 2009-10-29 09:30:48 +00:00
parent 838d936248
commit 5fb555b7fa
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openssh.spec
View File

@ -69,7 +69,7 @@
Summary: An open source implementation of SSH protocol versions 1 and 2 Summary: An open source implementation of SSH protocol versions 1 and 2
Name: openssh Name: openssh
Version: 5.3p1 Version: 5.3p1
Release: 5%{?dist}%{?rescue_rel} Release: 6%{?dist}%{?rescue_rel}
URL: http://www.openssh.com/portable.html URL: http://www.openssh.com/portable.html
#URL1: http://pamsshauth.sourceforge.net #URL1: http://pamsshauth.sourceforge.net
#Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@ -521,6 +521,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Oct 29 2009 Jan F. Chadima <jchadima@redhat.com> - 5.3p1-6
- Modify the init script to prevent it to hang during generating the keys (#515145)
* Tue Oct 27 2009 Jan F. Chadima <jchadima@redhat.com> - 5.3p1-5 * Tue Oct 27 2009 Jan F. Chadima <jchadima@redhat.com> - 5.3p1-5
- Add README.nss - Add README.nss

9
sshd.init
View File

@ -49,7 +49,8 @@ runlevel=$(set -- $(runlevel); eval "echo \$$#" )
do_rsa1_keygen() { do_rsa1_keygen() {
if [ ! -s $RSA1_KEY ]; then if [ ! -s $RSA1_KEY ]; then
echo -n $"Generating SSH1 RSA host key: " echo -n $"Generating SSH1 RSA host key: "
if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then rm -f $RSA1_KEY
if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then
chmod 600 $RSA1_KEY chmod 600 $RSA1_KEY
chmod 644 $RSA1_KEY.pub chmod 644 $RSA1_KEY.pub
if [ -x /sbin/restorecon ]; then if [ -x /sbin/restorecon ]; then
@ -68,7 +69,8 @@ do_rsa1_keygen() {
do_rsa_keygen() { do_rsa_keygen() {
if [ ! -s $RSA_KEY ]; then if [ ! -s $RSA_KEY ]; then
echo -n $"Generating SSH2 RSA host key: " echo -n $"Generating SSH2 RSA host key: "
if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then rm -f $RSA_KEY
if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then
chmod 600 $RSA_KEY chmod 600 $RSA_KEY
chmod 644 $RSA_KEY.pub chmod 644 $RSA_KEY.pub
if [ -x /sbin/restorecon ]; then if [ -x /sbin/restorecon ]; then
@ -87,7 +89,8 @@ do_rsa_keygen() {
do_dsa_keygen() { do_dsa_keygen() {
if [ ! -s $DSA_KEY ]; then if [ ! -s $DSA_KEY ]; then
echo -n $"Generating SSH2 DSA host key: " echo -n $"Generating SSH2 DSA host key: "
if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then rm -f $DSA_KEY
if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then
chmod 600 $DSA_KEY chmod 600 $DSA_KEY
chmod 644 $DSA_KEY.pub chmod 644 $DSA_KEY.pub
if [ -x /sbin/restorecon ]; then if [ -x /sbin/restorecon ]; then