diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-18 14:13:30 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-18 14:13:30 +0000 |
| commit | 887cfdd77aaa2210e1da65fcd2a5a4452b0cbc29 (patch) | |
| tree | 93af6307b283f25bcbce9a9c6c8baa89c9a36649 /usr.bin/ssh/auth2.c | |
| parent | 87a316979eadfa099f50a4ed7b87a1ccce28a79c (diff) | |
improved kbd-interactive support. work by per@appgate.com and me
Diffstat (limited to 'usr.bin/ssh/auth2.c')
| -rw-r--r-- | usr.bin/ssh/auth2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index f2ee9a2dbc1..18c2545fe90 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.56 2001/04/19 00:05:11 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.57 2001/05/18 14:13:28 markus Exp $"); #include <openssl/evp.h> @@ -51,6 +51,7 @@ RCSID("$OpenBSD: auth2.c,v 1.56 2001/04/19 00:05:11 markus Exp $"); #include "hostfile.h" #include "canohost.h" #include "tildexpand.h" +#include "match.h" /* import */ extern ServerOptions options; @@ -121,7 +122,7 @@ do_authentication2() x_authctxt = authctxt; /*XXX*/ /* challenge-reponse is implemented via keyboard interactive */ - if (options.challenge_reponse_authentication) + if (options.challenge_response_authentication) options.kbd_interactive_authentication = 1; dispatch_init(&protocol_error); @@ -352,20 +353,19 @@ int userauth_kbdint(Authctxt *authctxt) { int authenticated = 0; - char *lang = NULL; - char *devs = NULL; - + char *lang, *devs; + lang = packet_get_string(NULL); devs = packet_get_string(NULL); packet_done(); - debug("keyboard-interactive language %s devs %s", lang, devs); + debug("keyboard-interactive devs %s", devs); - if (options.challenge_reponse_authentication) + if (options.challenge_response_authentication) authenticated = auth2_challenge(authctxt, devs); - xfree(lang); xfree(devs); + xfree(lang); return authenticated; } |