diff options
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.56 2001/04/19 00:05:11 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.57 2001/05/18 14:13:28 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: auth2.c,v 1.56 2001/04/19 00:05:11 markus Exp $"); | |||
51 | #include "hostfile.h" | 51 | #include "hostfile.h" |
52 | #include "canohost.h" | 52 | #include "canohost.h" |
53 | #include "tildexpand.h" | 53 | #include "tildexpand.h" |
54 | #include "match.h" | ||
54 | 55 | ||
55 | /* import */ | 56 | /* import */ |
56 | extern ServerOptions options; | 57 | extern ServerOptions options; |
@@ -125,7 +126,7 @@ do_authentication2() | |||
125 | x_authctxt = authctxt; /*XXX*/ | 126 | x_authctxt = authctxt; /*XXX*/ |
126 | 127 | ||
127 | /* challenge-reponse is implemented via keyboard interactive */ | 128 | /* challenge-reponse is implemented via keyboard interactive */ |
128 | if (options.challenge_reponse_authentication) | 129 | if (options.challenge_response_authentication) |
129 | options.kbd_interactive_authentication = 1; | 130 | options.kbd_interactive_authentication = 1; |
130 | if (options.pam_authentication_via_kbd_int) | 131 | if (options.pam_authentication_via_kbd_int) |
131 | options.kbd_interactive_authentication = 1; | 132 | options.kbd_interactive_authentication = 1; |
@@ -400,24 +401,23 @@ int | |||
400 | userauth_kbdint(Authctxt *authctxt) | 401 | userauth_kbdint(Authctxt *authctxt) |
401 | { | 402 | { |
402 | int authenticated = 0; | 403 | int authenticated = 0; |
403 | char *lang = NULL; | 404 | char *lang, *devs; |
404 | char *devs = NULL; | ||
405 | 405 | ||
406 | lang = packet_get_string(NULL); | 406 | lang = packet_get_string(NULL); |
407 | devs = packet_get_string(NULL); | 407 | devs = packet_get_string(NULL); |
408 | packet_done(); | 408 | packet_done(); |
409 | 409 | ||
410 | debug("keyboard-interactive language %s devs %s", lang, devs); | 410 | debug("keyboard-interactive devs %s", devs); |
411 | 411 | ||
412 | if (options.challenge_reponse_authentication) | 412 | if (options.challenge_response_authentication) |
413 | authenticated = auth2_challenge(authctxt, devs); | 413 | authenticated = auth2_challenge(authctxt, devs); |
414 | 414 | ||
415 | #ifdef USE_PAM | 415 | #ifdef USE_PAM |
416 | if (authenticated == 0 && options.pam_authentication_via_kbd_int) | 416 | if (authenticated == 0 && options.pam_authentication_via_kbd_int) |
417 | authenticated = auth2_pam(authctxt); | 417 | authenticated = auth2_pam(authctxt); |
418 | #endif | 418 | #endif |
419 | xfree(lang); | ||
420 | xfree(devs); | 419 | xfree(devs); |
420 | xfree(lang); | ||
421 | #ifdef HAVE_CYGWIN | 421 | #ifdef HAVE_CYGWIN |
422 | if (check_nt_auth(0, authctxt->pw->pw_uid) == 0) | 422 | if (check_nt_auth(0, authctxt->pw->pw_uid) == 0) |
423 | return(0); | 423 | return(0); |