Attachment 448 Details for Bug 702 – alternative patch.

[patch] alternative patch.

A (text/plain), 1.18 KB, created by Markus Friedl on 2003-09-23 04:11:33 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2003-09-23 04:11:33 AEST

Size: 1.18 KB

patch

obsolete

>Index: auth2-chall.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth2-chall.c,v
>retrieving revision 1.20
>diff -u -r1.20 auth2-chall.c
>--- auth2-chall.c	30 Jun 2002 21:59:45 -0000	1.20
>+++ auth2-chall.c	22 Sep 2003 18:13:27 -0000
>@@ -244,7 +244,7 @@
> {
> 	Authctxt *authctxt = ctxt;
> 	KbdintAuthctxt *kbdintctxt;
>-	int i, authenticated = 0, res, len;
>+	int i, authenticated = 0, postponed, res, len;
> 	u_int nresp;
> 	char **response = NULL, *method;
> 
>@@ -304,16 +304,16 @@
> 	snprintf(method, len, "keyboard-interactive/%s",
> 	    kbdintctxt->device->name);
> 
>-	if (!authctxt->postponed) {
>-		if (authenticated) {
>-			auth2_challenge_stop(authctxt);
>-		} else {
>-			/* start next device */
>-			/* may set authctxt->postponed */
>-			auth2_challenge_start(authctxt);
>-		}
>-	}
>+	/*
>+	 * Save authctxt->postponed, because auth2_challenge_start
>+	 * may modify this value.
>+	 */
>+	postponed = authctxt->postponed;
>+	if (!postponed && !authenticated)
>+		auth2_challenge_start(authctxt);  /* start next device */
> 	userauth_finish(authctxt, authenticated, method);
>+	if (!postponed && authenticated)
>+		auth2_challenge_stop(authctxt);
> 	xfree(method);
> }
>

Actions: View | Diff

Attachments on bug 702: 447 | 448 | 449