diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | contrib/cygwin/ssh-host-config | 13 |
2 files changed, 16 insertions, 5 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20090129 | ||
2 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. | ||
3 | If the CYGWIN environment variable is empty, the installer script | ||
4 | should not install the service with an empty CYGWIN variable, but | ||
5 | rather without setting CYGWNI entirely. | ||
6 | |||
1 | 20090128 | 7 | 20090128 |
2 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. | 8 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. |
3 | Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x. | 9 | Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x. |
@@ -5102,5 +5108,5 @@ | |||
5102 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5108 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5103 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5109 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5104 | 5110 | ||
5105 | $Id: ChangeLog,v 1.5180 2009/01/28 20:50:04 tim Exp $ | 5111 | $Id: ChangeLog,v 1.5181 2009/01/29 20:30:01 tim Exp $ |
5106 | 5112 | ||
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index d4f5f32d0..ec03f163d 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -314,10 +314,14 @@ install_service() { | |||
314 | 314 | ||
315 | csih_check_user "${run_service_as}" | 315 | csih_check_user "${run_service_as}" |
316 | 316 | ||
317 | if [ -n "${csih_cygenv}" ] | ||
318 | then | ||
319 | cygwin_env="-e CYGWIN=\"${csih_cygenv}\"" | ||
320 | fi | ||
317 | if [ -z "${password}" ] | 321 | if [ -z "${password}" ] |
318 | then | 322 | then |
319 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \ | 323 | if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \ |
320 | -e CYGWIN="${csih_cygenv}" | 324 | -a "-D" -y tcpip ${cygwin_env} |
321 | then | 325 | then |
322 | echo | 326 | echo |
323 | csih_inform "The sshd service has been installed under the LocalSystem" | 327 | csih_inform "The sshd service has been installed under the LocalSystem" |
@@ -326,8 +330,9 @@ install_service() { | |||
326 | csih_inform "will start automatically after the next reboot." | 330 | csih_inform "will start automatically after the next reboot." |
327 | fi | 331 | fi |
328 | else | 332 | else |
329 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a "-D" -y tcpip \ | 333 | if eval cygrunsrv -I sshd -d \"CYGWIN sshd\" -p /usr/sbin/sshd \ |
330 | -e CYGWIN="${csih_cygenv}" -u "${run_service_as}" -w "${password}" | 334 | -a "-D" -y tcpip ${cygwin_env} \ |
335 | -u "${run_service_as}" -w "${password}" | ||
331 | then | 336 | then |
332 | echo | 337 | echo |
333 | csih_inform "The sshd service has been installed under the '${run_service_as}'" | 338 | csih_inform "The sshd service has been installed under the '${run_service_as}'" |