From e78c6ce8cfe5a31db0090f91728d3b14e9875cd5 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 10 Jan 2006 00:02:44 +1100 Subject: - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on tcpip service so it's always started after IP is up. Patch from vinschen at redhat.com. --- ChangeLog | 7 ++++++- contrib/cygwin/ssh-host-config | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a994dcb0..612612b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20060109 + - (dtucker) [contrib/cygwin/ssh-host-config] Make sshd service depend on + tcpip service so it's always started after IP is up. Patch from + vinschen at redhat.com. + 20060106 - (djm) OpenBSD CVS Sync - jmc@cvs.openbsd.org 2006/01/03 16:31:10 @@ -3669,4 +3674,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4082 2006/01/06 03:50:44 djm Exp $ +$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 fbfb5c19..0540890e 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -551,14 +551,14 @@ then [ -z "${_cygwin}" ] && _cygwin="ntsec" if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] then - if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" + if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" -y tcpip then echo echo "The service has been installed under sshd_server account." echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." fi else - if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" + if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" -y tcpip then echo echo "The service has been installed under LocalSystem account." -- cgit v1.2.3