- (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.
diff --git a/ChangeLog b/ChangeLog
index 25ce43e..affb5e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
- (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.
@@ -5102,5 +5108,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
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 $
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index d4f5f32..ec03f16 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -314,10 +314,14 @@
csih_check_user "${run_service_as}"
+ if [ -n "${csih_cygenv}" ]
+ then
+ cygwin_env="-e CYGWIN=\"${csih_cygenv}\""
+ fi
if [ -z "${password}" ]
then
- if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \
- -e CYGWIN="${csih_cygenv}"
+ if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \
+ -a "-D" -y tcpip ${cygwin_env}
then
echo
csih_inform "The sshd service has been installed under the LocalSystem"
@@ -326,8 +330,9 @@
csih_inform "will start automatically after the next reboot."
fi
else
- if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \
- -e CYGWIN="${csih_cygenv}" -u "${run_service_as}" -w "${password}"
+ if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \
+ -a "-D" -y tcpip ${cygwin_env} \
+ -u "${run_service_as}" -w "${password}"
then
echo
csih_inform "The sshd service has been installed under the '${run_service_as}'"