summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/auth2.c b/auth2.c
index 6e58797bd..3009e291e 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,3 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.114 2007/03/01 10:28:02 dtucker Exp $ */
1/* 2/*
2 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
3 * 4 *
@@ -23,23 +24,31 @@
23 */ 24 */
24 25
25#include "includes.h" 26#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $");
27 27
28#include "ssh2.h" 28#include <sys/types.h>
29
30#include <pwd.h>
31#include <stdarg.h>
32#include <string.h>
33
29#include "xmalloc.h" 34#include "xmalloc.h"
35#include "ssh2.h"
30#include "packet.h" 36#include "packet.h"
31#include "log.h" 37#include "log.h"
38#include "buffer.h"
32#include "servconf.h" 39#include "servconf.h"
33#include "compat.h" 40#include "compat.h"
41#include "key.h"
42#include "hostfile.h"
34#include "auth.h" 43#include "auth.h"
35#include "dispatch.h" 44#include "dispatch.h"
36#include "pathnames.h" 45#include "pathnames.h"
37#include "monitor_wrap.h"
38#include "buffer.h" 46#include "buffer.h"
39 47
40#ifdef GSSAPI 48#ifdef GSSAPI
41#include "ssh-gss.h" 49#include "ssh-gss.h"
42#endif 50#endif
51#include "monitor_wrap.h"
43 52
44/* import */ 53/* import */
45extern ServerOptions options; 54extern ServerOptions options;
@@ -89,15 +98,12 @@ int user_key_allowed(struct passwd *, Key *);
89void 98void
90do_authentication2(Authctxt *authctxt) 99do_authentication2(Authctxt *authctxt)
91{ 100{
92 /* challenge-response is implemented via keyboard interactive */
93 if (options.challenge_response_authentication)
94 options.kbd_interactive_authentication = 1;
95
96 dispatch_init(&dispatch_protocol_error); 101 dispatch_init(&dispatch_protocol_error);
97 dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); 102 dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);
98 dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); 103 dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt);
99} 104}
100 105
106/*ARGSUSED*/
101static void 107static void
102input_service_request(int type, u_int32_t seq, void *ctxt) 108input_service_request(int type, u_int32_t seq, void *ctxt)
103{ 109{
@@ -131,6 +137,7 @@ input_service_request(int type, u_int32_t seq, void *ctxt)
131 xfree(service); 137 xfree(service);
132} 138}
133 139
140/*ARGSUSED*/
134static void 141static void
135input_userauth_request(int type, u_int32_t seq, void *ctxt) 142input_userauth_request(int type, u_int32_t seq, void *ctxt)
136{ 143{