mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-25 11:22:10 +00:00
- (stevesk) OpenBSD sync:
- markus@cvs.openbsd.org 2001/02/08 11:20:01 [auth2.c] strict checking - markus@cvs.openbsd.org 2001/02/08 11:15:22 [version.h] update to 2.3.2 - markus@cvs.openbsd.org 2001/02/08 11:12:30 [auth2.c] fix typo
This commit is contained in:
parent
fc032bbf2f
commit
4abe4def70
10
ChangeLog
10
ChangeLog
@ -6,6 +6,16 @@
|
|||||||
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
|
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
|
||||||
- (bal) double entry in configure.in. Pointed out by Lutz Jaenicke
|
- (bal) double entry in configure.in. Pointed out by Lutz Jaenicke
|
||||||
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
|
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
|
||||||
|
- (stevesk) OpenBSD sync:
|
||||||
|
- markus@cvs.openbsd.org 2001/02/08 11:20:01
|
||||||
|
[auth2.c]
|
||||||
|
strict checking
|
||||||
|
- markus@cvs.openbsd.org 2001/02/08 11:15:22
|
||||||
|
[version.h]
|
||||||
|
update to 2.3.2
|
||||||
|
- markus@cvs.openbsd.org 2001/02/08 11:12:30
|
||||||
|
[auth2.c]
|
||||||
|
fix typo
|
||||||
|
|
||||||
20010208
|
20010208
|
||||||
- (djm) Don't delete external askpass program in make uninstall target.
|
- (djm) Don't delete external askpass program in make uninstall target.
|
||||||
|
4
auth2.c
4
auth2.c
@ -305,7 +305,7 @@ userauth_reply(Authctxt *authctxt, int authenticated)
|
|||||||
char *methods;
|
char *methods;
|
||||||
|
|
||||||
/* XXX todo: check if multiple auth methods are needed */
|
/* XXX todo: check if multiple auth methods are needed */
|
||||||
if (authenticated) {
|
if (authenticated == 1) {
|
||||||
#ifdef WITH_AIXAUTHENTICATE
|
#ifdef WITH_AIXAUTHENTICATE
|
||||||
/* We don't have a pty yet, so just label the line as "ssh" */
|
/* We don't have a pty yet, so just label the line as "ssh" */
|
||||||
if (loginsuccess(authctxt->user?authctxt->user:"NOUSER",
|
if (loginsuccess(authctxt->user?authctxt->user:"NOUSER",
|
||||||
@ -512,7 +512,7 @@ userauth_pubkey(Authctxt *authctxt)
|
|||||||
packet_put_string(pkblob, blen);
|
packet_put_string(pkblob, blen);
|
||||||
packet_send();
|
packet_send();
|
||||||
packet_write_wait();
|
packet_write_wait();
|
||||||
authenticated = -1;
|
authctxt->postponed = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (authenticated != 1)
|
if (authenticated != 1)
|
||||||
|
Loading…
Reference in New Issue
Block a user