===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-chall.c,v
retrieving revision 1.20.8.2
retrieving revision 1.21
diff -u -r1.20.8.2 -r1.21
--- src/usr.bin/ssh/auth2-chall.c	2005/03/10 17:15:04	1.20.8.2
+++ src/usr.bin/ssh/auth2-chall.c	2004/06/01 14:20:45	1.21
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth2-chall.c,v 1.20.8.2 2005/03/10 17:15:04 brad Exp $");
+RCSID("$OpenBSD: auth2-chall.c,v 1.21 2004/06/01 14:20:45 dtucker Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
@@ -268,7 +268,12 @@
 	}
 	packet_check_eom();
 
-	res = kbdintctxt->device->respond(kbdintctxt->ctxt, nresp, response);
+	if (authctxt->valid) {
+		res = kbdintctxt->device->respond(kbdintctxt->ctxt,
+		    nresp, response);
+	} else {
+		res = -1;
+	}
 
 	for (i = 0; i < nresp; i++) {
 		memset(response[i], 'r', strlen(response[i]));
@@ -280,7 +285,7 @@
 	switch (res) {
 	case 0:
 		/* Success! */
-		authenticated = authctxt->valid ? 1 : 0;
+		authenticated = 1;
 		break;
 	case 1:
 		/* Authentication needs further interaction */