diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /contrib/cygwin | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'contrib/cygwin')
-rw-r--r-- | contrib/cygwin/ssh-host-config | 4 | ||||
-rw-r--r-- | contrib/cygwin/ssh-user-config | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index fbfb5c195..0540890e6 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -551,14 +551,14 @@ then | |||
551 | [ -z "${_cygwin}" ] && _cygwin="ntsec" | 551 | [ -z "${_cygwin}" ] && _cygwin="ntsec" |
552 | if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] | 552 | if [ $_nt2003 -gt 0 -a "${sshd_server_in_sam}" = "yes" ] |
553 | then | 553 | then |
554 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" | 554 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -u sshd_server -w "${_password}" -e "CYGWIN=${_cygwin}" -y tcpip |
555 | then | 555 | then |
556 | echo | 556 | echo |
557 | echo "The service has been installed under sshd_server account." | 557 | echo "The service has been installed under sshd_server account." |
558 | echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." | 558 | echo "To start the service, call \`net start sshd' or \`cygrunsrv -S sshd'." |
559 | fi | 559 | fi |
560 | else | 560 | else |
561 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" | 561 | if cygrunsrv -I sshd -d "CYGWIN sshd" -p /usr/sbin/sshd -a -D -e "CYGWIN=${_cygwin}" -y tcpip |
562 | then | 562 | then |
563 | echo | 563 | echo |
564 | echo "The service has been installed under LocalSystem account." | 564 | echo "The service has been installed under LocalSystem account." |
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config index fe07ce360..9482efe9e 100644 --- a/contrib/cygwin/ssh-user-config +++ b/contrib/cygwin/ssh-user-config | |||
@@ -198,7 +198,7 @@ fi | |||
198 | 198 | ||
199 | if [ ! -f "${pwdhome}/.ssh/id_rsa" ] | 199 | if [ ! -f "${pwdhome}/.ssh/id_rsa" ] |
200 | then | 200 | then |
201 | if request "Shall I create an SSH2 RSA identity file for you? (yes/no) " | 201 | if request "Shall I create an SSH2 RSA identity file for you?" |
202 | then | 202 | then |
203 | echo "Generating ${pwdhome}/.ssh/id_rsa" | 203 | echo "Generating ${pwdhome}/.ssh/id_rsa" |
204 | if [ "${with_passphrase}" = "yes" ] | 204 | if [ "${with_passphrase}" = "yes" ] |
@@ -217,7 +217,7 @@ fi | |||
217 | 217 | ||
218 | if [ ! -f "${pwdhome}/.ssh/id_dsa" ] | 218 | if [ ! -f "${pwdhome}/.ssh/id_dsa" ] |
219 | then | 219 | then |
220 | if request "Shall I create an SSH2 DSA identity file for you? (yes/no) " | 220 | if request "Shall I create an SSH2 DSA identity file for you?" |
221 | then | 221 | then |
222 | echo "Generating ${pwdhome}/.ssh/id_dsa" | 222 | echo "Generating ${pwdhome}/.ssh/id_dsa" |
223 | if [ "${with_passphrase}" = "yes" ] | 223 | if [ "${with_passphrase}" = "yes" ] |