- (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 8679e176d76da3187d8aa7a3e4affaa5ee20528b..1d815a23be730876e939b92cef82f2284fa37b79 100644 (file)
--- 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.

diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index d4f5f32d006e545506ffaea1ded772b5e17d1e74..ec03f163d6c8ece695e22a89eb9d07afbb9a3e5e 100644 (file)
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -314,10 +314,14 @@ install_service() {
 
         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 @@ install_service() {
             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}'"