- Tidied default config file some more
- Revised Redhat initscript to fix bug: sshd (re)start would fail
if executed from inside a ssh login.
diff --git a/ChangeLog b/ChangeLog
index 1ac4dfe..8194b7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
19991113
- - Don't install config files if they already exist
- - Fix inclusion of additional preprocessor directives from acconfig.h
+ - Build patch from Niels Kristian Bech Jensen <nkbj@image.dk>
+ - Don't install config files if they already exist
+ - Fix inclusion of additional preprocessor directives from acconfig.h
- Removed redundant inclusions of config.h
- Added 'Obseletes' lines to RPM spec file
- Merged OpenBSD CVS changes:
@@ -11,6 +12,9 @@
have been initialised. Patch from Jani Hakala <jahakala@cc.jyu.fi>
- Added shadow password patch from Thomas Neumann <tom@smart.ruhr.de>
- Added ifdefs to auth-passwd.c to exclude it when PAM is enabled
+ - Tidied default config file some more
+ - Revised Redhat initscript to fix bug: sshd (re)start would fail
+ if executed from inside a ssh login.
19991112
- Merged changes from OpenBSD CVS
diff --git a/sshd.init.redhat b/sshd.init.redhat
index 40cc92b..5e91948 100755
--- a/sshd.init.redhat
+++ b/sshd.init.redhat
@@ -20,16 +20,17 @@
case "$1" in
start)
echo -n "Starting sshd: "
- daemon /usr/sbin/sshd
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
+ if [ ! -f /var/run/sshd.pid ] ; then
+ /usr/sbin/sshd && success "sshd startup" || failure "sshd startup"
+ RETVAL=$?
+ fi
echo
;;
stop)
echo -n "Shutting down sshd: "
- killproc sshd
- RETVAL=$?
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
+ if [ -f /var/run/sshd.pid ] ; then
+ killproc sshd
+ fi
echo
;;
restart)
diff --git a/sshd_config b/sshd_config
index ed9c391..ee6af5f 100644
--- a/sshd_config
+++ b/sshd_config
@@ -7,15 +7,6 @@
LoginGraceTime 600
KeyRegenerationInterval 3600
PermitRootLogin yes
-
-#
-# Loglevel replaces QuietMode and FascistLogging
-#
-SyslogFacility AUTH
-LogLevel INFO
-
-#
-# Don't read ~/.rhosts and ~/.shosts files
StrictModes yes
X11Forwarding no
X11DisplayOffset 10
@@ -23,8 +14,12 @@
KeepAlive yes
CheckMail no
UseLogin no
+
+#
+# Loglevel replaces QuietMode and FascistLogging
+#
SyslogFacility AUTH
-RhostsAuthentication no
+LogLevel INFO
#
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
@@ -35,6 +30,7 @@
# Don't read ~/.rhosts and ~/.shosts files
#
IgnoreRhosts yes
+RhostsAuthentication no
#
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication