Import of OpenSSH 4.0p1

[gssapi-openssh.git] / openssh / auth-chall.c

diff --git a/openssh/auth-chall.c b/openssh/auth-chall.c
index a9d314dd2a659e83acc7397189ee8ad2239385f0..e4f783096cdf971cf227dd62d0d56c53d53c9dea 100644 (file)
--- a/openssh/auth-chall.c
+++ b/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;