diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | auth2.c | 4 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 14 insertions, 4 deletions
@@ -6,6 +6,16 @@ | |||
6 | <Lutz.Jaenicke@aet.TU-Cottbus.DE> | 6 | <Lutz.Jaenicke@aet.TU-Cottbus.DE> |
7 | - (bal) double entry in configure.in. Pointed out by Lutz Jaenicke | 7 | - (bal) double entry in configure.in. Pointed out by Lutz Jaenicke |
8 | <Lutz.Jaenicke@aet.TU-Cottbus.DE> | 8 | <Lutz.Jaenicke@aet.TU-Cottbus.DE> |
9 | - (stevesk) OpenBSD sync: | ||
10 | - markus@cvs.openbsd.org 2001/02/08 11:20:01 | ||
11 | [auth2.c] | ||
12 | strict checking | ||
13 | - markus@cvs.openbsd.org 2001/02/08 11:15:22 | ||
14 | [version.h] | ||
15 | update to 2.3.2 | ||
16 | - markus@cvs.openbsd.org 2001/02/08 11:12:30 | ||
17 | [auth2.c] | ||
18 | fix typo | ||
9 | 19 | ||
10 | 20010208 | 20 | 20010208 |
11 | - (djm) Don't delete external askpass program in make uninstall target. | 21 | - (djm) Don't delete external askpass program in make uninstall target. |
@@ -305,7 +305,7 @@ userauth_reply(Authctxt *authctxt, int authenticated) | |||
305 | char *methods; | 305 | char *methods; |
306 | 306 | ||
307 | /* XXX todo: check if multiple auth methods are needed */ | 307 | /* XXX todo: check if multiple auth methods are needed */ |
308 | if (authenticated) { | 308 | if (authenticated == 1) { |
309 | #ifdef WITH_AIXAUTHENTICATE | 309 | #ifdef WITH_AIXAUTHENTICATE |
310 | /* We don't have a pty yet, so just label the line as "ssh" */ | 310 | /* We don't have a pty yet, so just label the line as "ssh" */ |
311 | if (loginsuccess(authctxt->user?authctxt->user:"NOUSER", | 311 | if (loginsuccess(authctxt->user?authctxt->user:"NOUSER", |
@@ -512,7 +512,7 @@ userauth_pubkey(Authctxt *authctxt) | |||
512 | packet_put_string(pkblob, blen); | 512 | packet_put_string(pkblob, blen); |
513 | packet_send(); | 513 | packet_send(); |
514 | packet_write_wait(); | 514 | packet_write_wait(); |
515 | authenticated = -1; | 515 | authctxt->postponed = 1; |
516 | } | 516 | } |
517 | } | 517 | } |
518 | if (authenticated != 1) | 518 | if (authenticated != 1) |
@@ -1,3 +1,3 @@ | |||
1 | /* $OpenBSD: version.h,v 1.16 2001/01/08 22:29:05 markus Exp $ */ | 1 | /* $OpenBSD: version.h,v 1.17 2001/02/08 18:15:22 markus Exp $ */ |
2 | 2 | ||
3 | #define SSH_VERSION "OpenSSH_2.3.1p1" | 3 | #define SSH_VERSION "OpenSSH_2.3.2p1" |