From 88cfeeadb0dabcff99c06c1623d4975fc63eaa29 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Tue, 19 Aug 2003 11:27:30 +0000 Subject: [PATCH] Piotr Esden-Tempski : Here is the fix for sshd so that it produces a more informative error on startup when no keys present. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1117 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-ESDEN | 9 +++++++++ package/base/openssh/sshd.init | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-ESDEN b/Documentation/Developers/CHANGELOG-ESDEN index f3bec3c18..07013dc15 100644 --- a/Documentation/Developers/CHANGELOG-ESDEN +++ b/Documentation/Developers/CHANGELOG-ESDEN @@ -2,6 +2,15 @@ This is a changelog for Dietlibc-Target, Alpha Target and all changes esden does for ROCKLinux ;-) +*) 2003-08-18 (2.0.0-camp - 2.0.0-rc1) + - fixed Task #38: sshd: issue a error if no keys are present on startup with a + reference how to create the keys. + +*) 2003-08-17 (2.0.0-camp - 2.0.0-rc1) + - fixed Task #67: stone: no dialog installed + - fixed a typo in packages/base/dietlibc/parse-config-9 + - added DIETLIBC flag to zlib + *) 2003-08-15 (2.0.0-camp - 2.0.0-rc1) - cleaned up the sshd init script see Task #38 in flyspray diff --git a/package/base/openssh/sshd.init b/package/base/openssh/sshd.init index c74e49361..758f33e8b 100644 --- a/package/base/openssh/sshd.init +++ b/package/base/openssh/sshd.init @@ -33,7 +33,8 @@ main_begin -e /etc/ssh/ssh_host_dsa_key -o \ -e /etc/ssh/ssh_host_rsa_key then - echo "Can't start sshd: No ssh host keys found !!" + echo "Can't start sshd: No ssh host keys found !!"\ + "Please create the keys using either ssh-keygen or stone." IN error=1 else check(`D_prefix/sbin/sshd') @@ -44,8 +45,8 @@ IN error=1 check(`if [ -s /var/run/sshd.pid ] ; then killall -15 $(cat /var/run/sshd.pid) else - echo "sshd is not running or /var/run/sshd.pid disappeared somewhere." - false + echo "sshd is not running or /var/run/sshd.pid disappeared." + error=1 fi') block_end @@ -53,8 +54,8 @@ IN error=1 check(`if [ -s /var/run/sshd.pid ] ; then kill -HUP $(cat /var/run/sshd.pid) else - echo "sshd is not running or /var/run/sshd.pid disappeared somewhere." - false + echo "sshd is not running or /var/run/sshd.pid disappeared." + error=1 fi') block_end