summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-08-22 10:43:48 +0200
committerDarren Tucker <dtucker@zip.com.au>2003-08-22 10:43:48 +0200
commit49d32566c26005364958a87b16857ec5073739bf (patch)
treeddcdf27013509c2606bfa84268740dd420b4337e
parent - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal (diff)
downloadopenssh-49d32566c26005364958a87b16857ec5073739bf.tar.xz
openssh-49d32566c26005364958a87b16857ec5073739bf.zip
- (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys
rather that authorized_keys2. Patch from vinschen@redhat.com.
-rw-r--r--ChangeLog4
-rw-r--r--contrib/cygwin/ssh-user-config8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ded30f05a..1303acc45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
20030822
- (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
-lbroken; ok dtucker
+ - (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys
+ rather that authorized_keys2. Patch from vinschen@redhat.com.
20030821
- (dtucker) OpenBSD CVS Sync
@@ -849,4 +851,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2897 2003/08/21 23:34:41 djm Exp $
+$Id: ChangeLog,v 1.2898 2003/08/22 08:43:48 dtucker Exp $
diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config
index 5a76adbaf..4da113181 100644
--- a/contrib/cygwin/ssh-user-config
+++ b/contrib/cygwin/ssh-user-config
@@ -171,8 +171,8 @@ then
fi
if request "Do you want to use this identity to login to this machine?"
then
- echo "Adding to ${pwdhome}/.ssh/authorized_keys2"
- cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys2"
+ echo "Adding to ${pwdhome}/.ssh/authorized_keys"
+ cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys"
fi
fi
fi
@@ -190,8 +190,8 @@ then
fi
if request "Do you want to use this identity to login to this machine?"
then
- echo "Adding to ${pwdhome}/.ssh/authorized_keys2"
- cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys2"
+ echo "Adding to ${pwdhome}/.ssh/authorized_keys"
+ cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys"
fi
fi
fi