- Redhat init script patch from Chun-Chung Chen

   <cjj@u.washington.edu>

diff --git a/ChangeLog b/ChangeLog
index b61c3b3a208e88de2ab6f1ed1288bf63841fa850..b89d475b9c8c3e27b8850c44b3769e70b0bebdc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+19991218
+ - Redhat init script patch from Chun-Chung Chen 
+   <cjj@u.washington.edu>
+
 19991216
  - Makefile changes for Solaris from Peter Kocks 
    <peter.kocks@baygate.com>
@@ -409,7 +413,8 @@
    - [ssh.1] user/958: check ~/.ssh/known_hosts for rhosts-rsa, too
    - [sshd.8] user/958: check ~/.ssh/known_hosts for rhosts-rsa, too
  - Fix integer overflow which was messing up scp's progress bar for large 
-   file transfers. Fix submitted to OpenBSD developers.
+   file transfers. Fix submitted to OpenBSD developers. Report and fix
+   from Kees Cook <cook@cpoint.net>
  - Merged more OpenBSD CVS changes:
    - [auth-krb4.c auth-passwd.c] remove x11- and krb-cleanup from fatal() 
      + krb-cleanup cleanup

diff --git a/packages/redhat/sshd.init b/packages/redhat/sshd.init
index a62866a2a4e655a7689997b3ca5b222255f6110f..cac91bb5102411af7c609b7473d332d18177add4 100755 (executable)
--- a/packages/redhat/sshd.init
+++ b/packages/redhat/sshd.init
@@ -31,6 +31,7 @@ case "$1" in
              RETVAL=$?
            ;;
          esac
+         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd
        fi
        echo
        ;;
@@ -40,6 +41,7 @@ case "$1" in
                killproc sshd
        fi
        echo
+       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sshd
        ;;
   restart)
         $0 stop