summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
120030822 120030822
2 - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 2 - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
3 -lbroken; ok dtucker 3 -lbroken; ok dtucker
4 - (dtucker) [contrib/cygwin/ssh-user-config] Put keys in authorized_keys
5 rather that authorized_keys2. Patch from vinschen@redhat.com.
4 6
520030821 720030821
6 - (dtucker) OpenBSD CVS Sync 8 - (dtucker) OpenBSD CVS Sync
@@ -849,4 +851,4 @@
849 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 851 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
850 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 852 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
851 853
852$Id: ChangeLog,v 1.2897 2003/08/21 23:34:41 djm Exp $ 854$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
171 fi 171 fi
172 if request "Do you want to use this identity to login to this machine?" 172 if request "Do you want to use this identity to login to this machine?"
173 then 173 then
174 echo "Adding to ${pwdhome}/.ssh/authorized_keys2" 174 echo "Adding to ${pwdhome}/.ssh/authorized_keys"
175 cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" 175 cat "${pwdhome}/.ssh/id_rsa.pub" >> "${pwdhome}/.ssh/authorized_keys"
176 fi 176 fi
177 fi 177 fi
178fi 178fi
@@ -190,8 +190,8 @@ then
190 fi 190 fi
191 if request "Do you want to use this identity to login to this machine?" 191 if request "Do you want to use this identity to login to this machine?"
192 then 192 then
193 echo "Adding to ${pwdhome}/.ssh/authorized_keys2" 193 echo "Adding to ${pwdhome}/.ssh/authorized_keys"
194 cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys2" 194 cat "${pwdhome}/.ssh/id_dsa.pub" >> "${pwdhome}/.ssh/authorized_keys"
195 fi 195 fi
196 fi 196 fi
197fi 197fi