summaryrefslogtreecommitdiffstats
path: root/auth-chall.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-01-20 22:20:50 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-01-20 22:20:50 +1100
commit3c66080aa26e5121805c80728a9c801b08a7870e (patch)
tree350a6cd92438b1ad876622b92557be577e8457b7 /auth-chall.c
parent33bc334a8bb6f20ca659f7d4f4669a04d54bd2e8 (diff)
- (dtucker) [auth-chall.c auth.h auth2-chall.c] Bug #936: Remove pam from
the list of available kbdint devices if UsePAM=no. ok djm@
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 a9d314dd..e4f78309 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 $");
#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;