summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--contrib/cygwin/ssh-user-config4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 54d92d23e..d786b1d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 - (dtucker) [configure.ac] Bug #1104: Tru64's printf family doesn't 5 - (dtucker) [configure.ac] Bug #1104: Tru64's printf family doesn't
6 understand "%lld", even though the compiler has "long long", so handle 6 understand "%lld", even though the compiler has "long long", so handle
7 it as a special case. Patch tested by mcaskill.scott at epa.gov. 7 it as a special case. Patch tested by mcaskill.scott at epa.gov.
8 - (dtucker) [contrib/cygwin/ssh-user-config] Remove duplicate yes/no
9 prompt. Patch from vinschen at redhat.com.
8 10
920051017 1120051017
10 - (dtucker) [configure.ac] Bug #1097: Fix configure for cross-compiling. 12 - (dtucker) [configure.ac] Bug #1097: Fix configure for cross-compiling.
@@ -3113,4 +3115,4 @@
3113 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3115 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3114 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3116 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3115 3117
3116$Id: ChangeLog,v 1.3922 2005/10/25 08:52:31 dtucker Exp $ 3118$Id: ChangeLog,v 1.3923 2005/10/25 08:55:00 dtucker Exp $
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
199if [ ! -f "${pwdhome}/.ssh/id_rsa" ] 199if [ ! -f "${pwdhome}/.ssh/id_rsa" ]
200then 200then
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
218if [ ! -f "${pwdhome}/.ssh/id_dsa" ] 218if [ ! -f "${pwdhome}/.ssh/id_dsa" ]
219then 219then
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" ]