summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--contrib/cygwin/ssh-host-config4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a994dcb07..612612b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120060109
2 - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on
3 tcpip service so it's always started after IP is up. Patch from
4 vinschen at redhat.com.
5
120060106 620060106
2 - (djm) OpenBSD CVS Sync 7 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2006/01/03 16:31:10 8 - jmc@cvs.openbsd.org 2006/01/03 16:31:10
@@ -3669,4 +3674,4 @@
3669 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3674 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3670 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3675 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3671 3676
3672$Id: ChangeLog,v 1.4082 2006/01/06 03:50:44 djm Exp $ 3677$Id: ChangeLog,v 1.4083 2006/01/09 13:02:44 dtucker Exp $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index fbfb5c195..0540890e6 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -551,14 +551,14 @@ then
551 [ -z "${_cygwin}" ] && _cygwin="ntsec" 551 [ -z "${_cygwin}" ] && _cygwin="ntsec"
552 if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] 552 if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ]
553 then 553 then
554 if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" 554 if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" -y tcpip
555 then 555 then
556 echo 556 echo
557 echo "The service has been installed under sshd_server account." 557 echo "The service has been installed under sshd_server account."
558 echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." 558 echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'."
559 fi 559 fi
560 else 560 else
561 if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" 561 if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" -y tcpip
562 then 562 then
563 echo 563 echo
564 echo "The service has been installed under LocalSystem account." 564 echo "The service has been installed under LocalSystem account."