diff --git a/ChangeLog b/ChangeLog index 39f9a7eb0..b24704836 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,11 @@ - markus@cvs.openbsd.org 2000/10/15 08:18:31 [rijndael.c] typo - - Copy manpages back over from OpenBSD - too tedious to wade through diffs + - (djm) Copy manpages back over from OpenBSD - too tedious to wade + through diffs + - Added condrestart to Redhat init script. Patch from Pekka Savola + + - Update version in Redhat spec file 20001015 - (djm) Fix ssh2 hang on background processes at logout. diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index d1bd16701..95be389c8 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -1,5 +1,5 @@ # Version of OpenSSH -%define oversion 2.2.0p2 +%define oversion 2.3.0p1 # Version of ssh-askpass %define aversion 1.0.2 diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init index a30d48065..83c10a885 100755 --- a/contrib/redhat/sshd.init +++ b/contrib/redhat/sshd.init @@ -81,12 +81,19 @@ case "$1" in $0 start RETVAL=$? ;; + condrestart) + if [ -f /var/lock/subsys/sshd ] ; then + $0 stop + $0 start + RETVAL=$? + fi + ;; status) status sshd RETVAL=$? ;; *) - echo "Usage: sshd {start|stop|restart|status}" + echo "Usage: sshd {start|stop|restart|status|condrestart}" exit 1 ;; esac