===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- src/usr.bin/ssh/auth2.c	2001/01/22 08:32:53	1.33
+++ src/usr.bin/ssh/auth2.c	2001/01/22 23:06:39	1.34
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.33 2001/01/22 08:32:53 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.34 2001/01/22 23:06:39 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -110,6 +110,10 @@
 
 	x_authctxt = authctxt;		/*XXX*/
 
+	/* challenge-reponse is implemented via keyboard interactive */
+	if (options.challenge_reponse_authentication)
+		options.kbd_interactive_authentication = 1;
+
 #ifdef AFS
 	/* If machine has AFS, set process authentication group. */
 	if (k_hasafs()) {
@@ -344,7 +348,8 @@
 
 	debug("keyboard-interactive language %s devs %s", lang, devs);
 
-	authenticated = auth2_challenge(authctxt, devs);
+	if (options.challenge_reponse_authentication)
+		authenticated = auth2_challenge(authctxt, devs);
 
 	xfree(lang);
 	xfree(devs);