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/auth2.c | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth2.c')
| -rw-r--r-- | crypto/openssh/auth2.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c index 2ce95e0..a6b95dd 100644 --- a/crypto/openssh/auth2.c +++ b/crypto/openssh/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.102 2003/08/26 09:58:43 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.104 2003/11/04 08:54:09 djm Exp $"); RCSID("$FreeBSD$"); #include "canohost.h" @@ -47,8 +47,6 @@ extern ServerOptions options; extern u_char *session_id2; extern u_int session_id2_len; -Authctxt *x_authctxt = NULL; - /* methods */ extern Authmethod method_none; @@ -81,19 +79,14 @@ static void input_userauth_request(int, u_int32_t, void *); static Authmethod *authmethod_lookup(const char *); static char *authmethods_get(void); int user_key_allowed(struct passwd *, Key *); -int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); /* * loop until authctxt->success == TRUE */ -Authctxt * -do_authentication2(void) +void +do_authentication2(Authctxt *authctxt) { - Authctxt *authctxt = authctxt_new(); - - x_authctxt = authctxt; /*XXX*/ - /* challenge-response is implemented via keyboard interactive */ if (options.challenge_response_authentication) options.kbd_interactive_authentication = 1; @@ -101,8 +94,6 @@ do_authentication2(void) dispatch_init(&dispatch_protocol_error); dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); - - return (authctxt); } static void @@ -294,14 +285,6 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) } } -/* get current user */ - -struct passwd* -auth_get_user(void) -{ - return (x_authctxt != NULL && x_authctxt->valid) ? x_authctxt->pw : NULL; -} - #define DELIM "," static char * |
