diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-07 19:55:44 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-07 19:55:44 +1000 |
commit | d3a185709dfb8588ae7cacc079312d1fcc450e9c (patch) | |
tree | 8e9798d35f76171481f034720767e507e6bbd6f9 /sshconnect2.c | |
parent | e37bfc19f7263b838896ae403e55aa703a06b69a (diff) |
- (djm) Fix rsh path in RPMs. Report from Jason L Tibbitts III
<tibbs@math.uh.edu>
- (djm) OpenBSD CVS updates:
- todd@cvs.openbsd.org
[sshconnect2.c]
teach protocol v2 to count login failures properly and also enable an
explanation of why the password prompt comes up again like v1; this is NOT
crypto
- markus@cvs.openbsd.org
[readconf.c readconf.h servconf.c servconf.h session.c ssh.1 ssh.c sshd.8]
xauth_location support; pr 1234
[readconf.c sshconnect2.c]
typo, unused
[session.c]
allow use_login only for login sessions, otherwise remote commands are
execed with uid==0
[sshd.8]
document UseLogin better
[version.h]
OpenSSH 2.1.1
[auth-rsa.c]
fix match_hostname() logic for auth-rsa: deny access if we have a
negative match or no match at all
[channels.c hostfile.c match.c]
don't panic if mkdtemp fails for authfwd; jkb@yahoo-inc.com via
kris@FreeBSD.org
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 0abcf89a0..77b8652ea 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$OpenBSD: sshconnect2.c,v 1.11 2000/05/25 20:45:20 markus Exp $"); | 31 | RCSID("$OpenBSD: sshconnect2.c,v 1.13 2000/06/02 02:00:19 todd Exp $"); |
32 | 32 | ||
33 | #include <openssl/bn.h> | 33 | #include <openssl/bn.h> |
34 | #include <openssl/rsa.h> | 34 | #include <openssl/rsa.h> |
@@ -71,7 +71,6 @@ void | |||
71 | ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr, | 71 | ssh_kex_dh(Kex *kex, char *host, struct sockaddr *hostaddr, |
72 | Buffer *client_kexinit, Buffer *server_kexinit) | 72 | Buffer *client_kexinit, Buffer *server_kexinit) |
73 | { | 73 | { |
74 | int i; | ||
75 | int plen, dlen; | 74 | int plen, dlen; |
76 | unsigned int klen, kout; | 75 | unsigned int klen, kout; |
77 | char *signature = NULL; | 76 | char *signature = NULL; |
@@ -265,9 +264,12 @@ ssh2_try_passwd(const char *server_user, const char *host, const char *service) | |||
265 | char prompt[80]; | 264 | char prompt[80]; |
266 | char *password; | 265 | char *password; |
267 | 266 | ||
268 | if (attempt++ > options.number_of_password_prompts) | 267 | if (attempt++ >= options.number_of_password_prompts) |
269 | return 0; | 268 | return 0; |
270 | 269 | ||
270 | if(attempt != 1) | ||
271 | error("Permission denied, please try again."); | ||
272 | |||
271 | snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", | 273 | snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", |
272 | server_user, host); | 274 | server_user, host); |
273 | password = read_passphrase(prompt, 0); | 275 | password = read_passphrase(prompt, 0); |