From owner-p4-projects  Mon Apr  1  4:14: 3 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0AFA37B417; Mon,  1 Apr 2002 04:13:57 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 018C337B416
	for <perforce@freebsd.org>; Mon,  1 Apr 2002 04:13:57 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g31CDu214052
	for perforce@freebsd.org; Mon, 1 Apr 2002 04:13:56 -0800 (PST)
	(envelope-from des@freebsd.org)
Date: Mon, 1 Apr 2002 04:13:56 -0800 (PST)
Message-Id: <200204011213.g31CDu214052@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Subject: PERFORCE change 8760 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8760

Change 8760 by des@des.at.des.thinksec.com on 2002/04/01 04:13:56

	Fix braino that arose from confusion between data and dp.  This
	unbreaks the pam_ldap module.
	
	Based on a patch by Joe Marcus Clarke <marcus@marcuscom.com>.
	
	Sponsored by:	DARPA, NAI Labs

Affected files ...

... //depot/projects/openpam/lib/pam_set_data.c#9 edit

Differences ...

==== //depot/projects/openpam/lib/pam_set_data.c#9 (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/pam_set_data.c#8 $
+ * $P4: //depot/projects/openpam/lib/pam_set_data.c#9 $
  */
 
 #include <stdlib.h>
@@ -74,11 +74,13 @@
 	if ((dp = malloc(sizeof *dp)) == NULL)
 		return (PAM_BUF_ERR);
 	if ((dp->name = strdup(module_data_name)) == NULL) {
-		free(data);
+		free(dp);
 		return (PAM_BUF_ERR);
 	}
+	dp->data = data;
+	dp->cleanup = cleanup;
 	dp->next = pamh->module_data;
-	pamh->module_data = data;
+	pamh->module_data = dp;
 	return (PAM_SUCCESS);
 }
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message