From a841dceb4c506fd21cd4278bd2dbf04fc4f13fc2 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 25 Oct 2005 18:55:00 +1000
Subject: [PATCH]  - (dtucker) [contrib/cygwin/ssh-user-config] Remove
 duplicate yes/no    prompt.  Patch from vinschen at redhat.com.

---
 ChangeLog                      | 4 +++-
 contrib/cygwin/ssh-user-config | 4 ++--
 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 @@
  - (dtucker) [configure.ac] Bug #1104: Tru64's printf family doesn't
    understand "%lld", even though the compiler has "long long", so handle
    it as a special case.  Patch tested by mcaskill.scott at epa.gov.
+ - (dtucker) [contrib/cygwin/ssh-user-config] Remove duplicate yes/no
+   prompt.  Patch from vinschen at redhat.com.
 
 20051017
  - (dtucker) [configure.ac] Bug #1097: Fix configure for cross-compiling.
@@ -3113,4 +3115,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3922 2005/10/25 08:52:31 dtucker Exp $
+$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
 
 if [ ! -f "${pwdhome}/.ssh/id_rsa" ]
 then
-  if request "Shall I create an SSH2 RSA identity file for you? (yes/no) "
+  if request "Shall I create an SSH2 RSA identity file for you?"
   then
     echo "Generating ${pwdhome}/.ssh/id_rsa"
     if [ "${with_passphrase}" = "yes" ]
@@ -217,7 +217,7 @@ fi
 
 if [ ! -f "${pwdhome}/.ssh/id_dsa" ]
 then
-  if request "Shall I create an SSH2 DSA identity file for you? (yes/no) "
+  if request "Shall I create an SSH2 DSA identity file for you?"
   then
     echo "Generating ${pwdhome}/.ssh/id_dsa"
     if [ "${with_passphrase}" = "yes" ]