From owner-p4-projects@FreeBSD.ORG  Wed Nov 19 00:37:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0385A16A4D0; Wed, 19 Nov 2003 00:37:02 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D2E3416A4CE
	for <perforce@freebsd.org>; Wed, 19 Nov 2003 00:37:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4431B43FA3
	for <perforce@freebsd.org>; Wed, 19 Nov 2003 00:37:01 -0800 (PST)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAJ8b1XJ024116
	for <perforce@freebsd.org>; Wed, 19 Nov 2003 00:37:01 -0800 (PST)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAJ8b0Zb024113
	for perforce@freebsd.org; Wed, 19 Nov 2003 00:37:00 -0800 (PST)
	(envelope-from des@freebsd.org)
Date: Wed, 19 Nov 2003 00:37:00 -0800 (PST)
Message-Id: <200311190837.hAJ8b0Zb024113@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42758 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Nov 2003 08:37:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=42758

Change 42758 by des@des.at.des.thinksec.com on 2003/11/19 00:36:36

	Belatedly fix confusion about the layout of resp, cf. similar changes
	in OpenSSH-portable.

Affected files ...

.. //depot/projects/openpam/lib/openpam_ttyconv.c#23 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_ttyconv.c#23 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#22 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $
  */
 
 #include <sys/types.h>
@@ -179,13 +179,13 @@
 		resp[i]->resp = NULL;
 		switch (msg[i]->msg_style) {
 		case PAM_PROMPT_ECHO_OFF:
-			resp[i]->resp = prompt_echo_off(msg[i]->msg);
-			if (resp[i]->resp == NULL)
+			(*resp[i]).resp = prompt_echo_off(msg[i]->msg);
+			if ((*resp[i]).resp == NULL)
 				goto fail;
 			break;
 		case PAM_PROMPT_ECHO_ON:
-			resp[i]->resp = prompt(msg[i]->msg);
-			if (resp[i]->resp == NULL)
+			(*resp[i]).resp = prompt(msg[i]->msg);
+			if ((*resp[i]).resp == NULL)
 				goto fail;
 			break;
 		case PAM_ERROR_MSG:
@@ -206,11 +206,13 @@
 	}
 	RETURNC(PAM_SUCCESS);
  fail:
-	while (i)
-		if (resp[--i]->resp) {
-			memset(resp[i]->resp, 0, strlen(resp[i]->resp));
-			FREE(resp[i]->resp);
+	for (i = 0; i < n; ++i) {
+		if ((*resp[i]).resp != NULL) {
+			memset((*resp[i]).resp, 0, strlen((*resp[i]).resp));
+			FREE((*resp[i]).resp);
 		}
+	}
+	memset(*resp, 0, n * sizeof **resp);
 	FREE(*resp);
 	RETURNC(PAM_CONV_ERR);
 }