summaryrefslogtreecommitdiff
path: root/auth-chall.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
committerColin Watson <cjwatson@debian.org>2005-05-25 11:01:01 +0000
commite88de75a1a236779a10e8ccbcc51d25308be8840 (patch)
tree7495477a2a7d0cac17a9fcded020b6ea816182ef /auth-chall.c
parent30a0f9443782cd9d7308acd09430bf586186aa55 (diff)
parent5d05471f6657646d1d6500c7c43134462c407ee6 (diff)
Merge 4.0p1 to the trunk.
Diffstat (limited to 'auth-chall.c')
-rw-r--r--auth-chall.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/auth-chall.c b/auth-chall.c
index a9d314dd2..e4f783096 100644
--- a/auth-chall.c
+++ b/auth-chall.c
@@ -28,11 +28,13 @@ RCSID("$OpenBSD: auth-chall.c,v 1.9 2003/11/03 09:03:37 djm Exp $");
28#include "auth.h" 28#include "auth.h"
29#include "log.h" 29#include "log.h"
30#include "xmalloc.h" 30#include "xmalloc.h"
31#include "servconf.h"
31 32
32/* limited protocol v1 interface to kbd-interactive authentication */ 33/* limited protocol v1 interface to kbd-interactive authentication */
33 34
34extern KbdintDevice *devices[]; 35extern KbdintDevice *devices[];
35static KbdintDevice *device; 36static KbdintDevice *device;
37extern ServerOptions options;
36 38
37char * 39char *
38get_challenge(Authctxt *authctxt) 40get_challenge(Authctxt *authctxt)
@@ -41,6 +43,11 @@ get_challenge(Authctxt *authctxt)
41 u_int i, numprompts; 43 u_int i, numprompts;
42 u_int *echo_on; 44 u_int *echo_on;
43 45
46#ifdef USE_PAM
47 if (!options.use_pam)
48 remove_kbdint_device("pam");
49#endif
50
44 device = devices[0]; /* we always use the 1st device for protocol 1 */ 51 device = devices[0]; /* we always use the 1st device for protocol 1 */
45 if (device == NULL) 52 if (device == NULL)
46 return NULL; 53 return NULL;