- dtucker@cvs.openbsd.org 2005/11/21 09:42:10
[auth-krb5.c] Perform Kerberos calls even for invalid users to prevent leaking information about account validity. bz #975, patch originally from Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@, ok markus@
This commit is contained in:
parent
e8400da9d5
commit
f4732f6475
|
@ -12,6 +12,12 @@
|
||||||
will pull it in. At the moment it gets pulled in by sys/select.h
|
will pull it in. At the moment it gets pulled in by sys/select.h
|
||||||
(which ssh has no business including) via event.h. OK markus@
|
(which ssh has no business including) via event.h. OK markus@
|
||||||
(ID sync only in -portable)
|
(ID sync only in -portable)
|
||||||
|
- dtucker@cvs.openbsd.org 2005/11/21 09:42:10
|
||||||
|
[auth-krb5.c]
|
||||||
|
Perform Kerberos calls even for invalid users to prevent leaking
|
||||||
|
information about account validity. bz #975, patch originally from
|
||||||
|
Senthil Kumar, sanity checked by Simon Wilkinson, tested by djm@, biorn@,
|
||||||
|
ok markus@
|
||||||
|
|
||||||
20051120
|
20051120
|
||||||
- (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
|
- (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
|
||||||
|
@ -3321,4 +3327,4 @@
|
||||||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3999 2005/11/22 08:41:33 dtucker Exp $
|
$Id: ChangeLog,v 1.4000 2005/11/22 08:42:42 dtucker Exp $
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $");
|
RCSID("$OpenBSD: auth-krb5.c,v 1.16 2005/11/21 09:42:10 dtucker Exp $");
|
||||||
|
|
||||||
#include "ssh.h"
|
#include "ssh.h"
|
||||||
#include "ssh1.h"
|
#include "ssh1.h"
|
||||||
|
@ -69,9 +69,6 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
|
||||||
krb5_ccache ccache = NULL;
|
krb5_ccache ccache = NULL;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
if (!authctxt->valid)
|
|
||||||
return (0);
|
|
||||||
|
|
||||||
temporarily_use_uid(authctxt->pw);
|
temporarily_use_uid(authctxt->pw);
|
||||||
|
|
||||||
problem = krb5_init(authctxt);
|
problem = krb5_init(authctxt);
|
||||||
|
@ -188,7 +185,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
|
||||||
else
|
else
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
return (1);
|
return (authctxt->valid ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue