RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. 

If the CYGWIN environment variable is empty, the installer script
   should not install the service with an empty CYGWIN variable, but
   rather without setting CYGWNI entirely.
This commit is contained in:
Tim Rice 2009-01-29 12:30:01 -08:00
parent ca3692d1a9
commit 6a32534968
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
20090129
- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
If the CYGWIN environment variable is empty, the installer script
should not install the service with an empty CYGWIN variable, but
rather without setting CYGWNI entirely.
20090128 20090128
- (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen.
Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x. Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x.
@ -5102,5 +5108,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5180 2009/01/28 20:50:04 tim Exp $ $Id: ChangeLog,v 1.5181 2009/01/29 20:30:01 tim Exp $

13
contrib/cygwin/ssh-host-config
View File

@ -314,10 +314,14 @@ install_service() {
csih_check_user "${run_service_as}" csih_check_user "${run_service_as}"
if [ -n "${csih_cygenv}" ]
then
cygwin_env="-e CYGWIN=\"${csih_cygenv}\""
fi
if [ -z "${password}" ] if [ -z "${password}" ]
then then
if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \ if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \
-e CYGWIN="${csih_cygenv}" -a "-D" -y tcpip ${cygwin_env}
then then
echo echo
csih_inform "The sshd service has been installed under the LocalSystem" csih_inform "The sshd service has been installed under the LocalSystem"
@ -326,8 +330,9 @@ install_service() {
csih_inform "will start automatically after the next reboot." csih_inform "will start automatically after the next reboot."
fi fi
else else
if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \ if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \
-e CYGWIN="${csih_cygenv}" -u "${run_service_as}" -w "${password}" -a "-D" -y tcpip ${cygwin_env} \
-u "${run_service_as}" -w "${password}"
then then
echo echo
csih_inform "The sshd service has been installed under the '${run_service_as}'" csih_inform "The sshd service has been installed under the '${run_service_as}'"