- Tidied default config file some more

- Revised Redhat initscript to fix bug: sshd (re)start would fail
   if executed from inside a ssh login.
This commit is contained in:
Damien Miller 1999-11-13 23:56:35 +11:00
parent 2cb210f0f7
commit 192bd0120a
3 changed files with 19 additions and 18 deletions

View File

@ -1,4 +1,5 @@
19991113 19991113
- Build patch from Niels Kristian Bech Jensen <nkbj@image.dk>
- Don't install config files if they already exist - Don't install config files if they already exist
- Fix inclusion of additional preprocessor directives from acconfig.h - Fix inclusion of additional preprocessor directives from acconfig.h
- Removed redundant inclusions of config.h - Removed redundant inclusions of config.h
@ -11,6 +12,9 @@
have been initialised. Patch from Jani Hakala <jahakala@cc.jyu.fi> have been initialised. Patch from Jani Hakala <jahakala@cc.jyu.fi>
- Added shadow password patch from Thomas Neumann <tom@smart.ruhr.de> - Added shadow password patch from Thomas Neumann <tom@smart.ruhr.de>
- Added ifdefs to auth-passwd.c to exclude it when PAM is enabled - 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 19991112
- Merged changes from OpenBSD CVS - Merged changes from OpenBSD CVS

View File

@ -20,16 +20,17 @@ RETVAL=0
case "$1" in case "$1" in
start) start)
echo -n "Starting sshd: " echo -n "Starting sshd: "
daemon /usr/sbin/sshd if [ ! -f /var/run/sshd.pid ] ; then
/usr/sbin/sshd && success "sshd startup" || failure "sshd startup"
RETVAL=$? RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd fi
echo echo
;; ;;
stop) stop)
echo -n "Shutting down sshd: " echo -n "Shutting down sshd: "
if [ -f /var/run/sshd.pid ] ; then
killproc sshd killproc sshd
RETVAL=$? fi
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
echo echo
;; ;;
restart) restart)

View File

@ -7,15 +7,6 @@ ServerKeyBits 768
LoginGraceTime 600 LoginGraceTime 600
KeyRegenerationInterval 3600 KeyRegenerationInterval 3600
PermitRootLogin yes PermitRootLogin yes
#
# Loglevel replaces QuietMode and FascistLogging
#
SyslogFacility AUTH
LogLevel INFO
#
# Don't read ~/.rhosts and ~/.shosts files
StrictModes yes StrictModes yes
X11Forwarding no X11Forwarding no
X11DisplayOffset 10 X11DisplayOffset 10
@ -23,8 +14,12 @@ PrintMotd yes
KeepAlive yes KeepAlive yes
CheckMail no CheckMail no
UseLogin no UseLogin no
#
# Loglevel replaces QuietMode and FascistLogging
#
SyslogFacility AUTH SyslogFacility AUTH
RhostsAuthentication no LogLevel INFO
# #
# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
@ -35,6 +30,7 @@ RhostsRSAAuthentication no
# Don't read ~/.rhosts and ~/.shosts files # Don't read ~/.rhosts and ~/.shosts files
# #
IgnoreRhosts yes IgnoreRhosts yes
RhostsAuthentication no
# #
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication # Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication