diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/auth-rsa.c | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth-rsa.c')
| -rw-r--r-- | crypto/openssh/auth-rsa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/openssh/auth-rsa.c b/crypto/openssh/auth-rsa.c index 5631d23..2f0746b 100644 --- a/crypto/openssh/auth-rsa.c +++ b/crypto/openssh/auth-rsa.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rsa.c,v 1.57 2003/04/08 20:21:28 itojun Exp $"); +RCSID("$OpenBSD: auth-rsa.c,v 1.58 2003/11/04 08:54:09 djm Exp $"); #include <openssl/rsa.h> #include <openssl/md5.h> @@ -284,13 +284,14 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) * successful. This may exit if there is a serious protocol violation. */ int -auth_rsa(struct passwd *pw, BIGNUM *client_n) +auth_rsa(Authctxt *authctxt, BIGNUM *client_n) { Key *key; char *fp; + struct passwd *pw = authctxt->pw; /* no user given */ - if (pw == NULL) + if (!authctxt->valid) return 0; if (!PRIVSEP(auth_rsa_key_allowed(pw, client_n, &key))) { |
