diff options
| author | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-05 15:40:50 +0000 |
| commit | 11a09ab416e21c995885dc0e5847151627094217 (patch) | |
| tree | 7767975616a98948a7ef791c43b28a21711a22c7 /crypto/openssh/auth-chall.c | |
| parent | d5d493f03ae792146848e3cba16bb9e667c73125 (diff) | |
| download | FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.zip FreeBSD-src-11a09ab416e21c995885dc0e5847151627094217.tar.gz | |
Vendor import of OpenSSH 4.0p1.
Diffstat (limited to 'crypto/openssh/auth-chall.c')
| -rw-r--r-- | crypto/openssh/auth-chall.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/openssh/auth-chall.c b/crypto/openssh/auth-chall.c index a9d314d..e4f7830 100644 --- a/crypto/openssh/auth-chall.c +++ b/crypto/openssh/auth-chall.c @@ -28,11 +28,13 @@ RCSID("$OpenBSD: auth-chall.c,v 1.9 2003/11/03 09:03:37 djm Exp $"); #include "auth.h" #include "log.h" #include "xmalloc.h" +#include "servconf.h" /* limited protocol v1 interface to kbd-interactive authentication */ extern KbdintDevice *devices[]; static KbdintDevice *device; +extern ServerOptions options; char * get_challenge(Authctxt *authctxt) @@ -41,6 +43,11 @@ get_challenge(Authctxt *authctxt) u_int i, numprompts; u_int *echo_on; +#ifdef USE_PAM + if (!options.use_pam) + remove_kbdint_device("pam"); +#endif + device = devices[0]; /* we always use the 1st device for protocol 1 */ if (device == NULL) return NULL; |
