From owner-p4-projects@FreeBSD.ORG  Wed Jan 25 00:55:15 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D810816A422; Wed, 25 Jan 2006 00:55:14 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 7B2C316A41F
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 00:55:14 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4434B43D45
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 00:55:14 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0P0tE8W080025
	for <perforce@freebsd.org>; Wed, 25 Jan 2006 00:55:14 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0P0tD18080022
	for perforce@freebsd.org; Wed, 25 Jan 2006 00:55:13 GMT
	(envelope-from wsalamon@computer.org)
Date: Wed, 25 Jan 2006 00:55:13 GMT
Message-Id: <200601250055.k0P0tD18080022@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 25 Jan 2006 00:55:15 -0000

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

Change 90312 by wsalamon@gretsch on 2006/01/25 00:55:03

	Fix up auditd to use the latest BSM API, where auditd is responsible
	for memory management of the audit event record.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#13 (text+ko) ====

@@ -564,7 +564,7 @@
  */
 int config_audit_controls(long flags)
 {
-	au_event_ent_t *ev;
+	au_event_ent_t ev, *evp;
 	au_evclass_map_t evc_map;
 	au_mask_t aumask;
 	int ctr = 0;
@@ -578,23 +578,29 @@
 	 * but should. We need a way to get a count of the events.
 	*/
 
-	setauevent();
-	while((ev = getauevent()) != NULL) {
-		evc_map.ec_number = ev->ae_number;
-		evc_map.ec_class = ev->ae_class;
+	ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX);
+	ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX);
+	if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) {
+		syslog(LOG_ERR,
+		    "Memory allocation error when configuring audit controls.");
+		return (-1);
+	}
+	evp = &ev;
+	while((evp = getauevent_r(evp)) != NULL) {
+		evc_map.ec_number = evp->ae_number;
+		evc_map.ec_class = evp->ae_class;
 		if (auditon(A_SETCLASS, &evc_map,
 		    sizeof(au_evclass_map_t)) != 0) {
 			syslog(LOG_ERR, 
 				"Failed to register class mapping for event %s",
-				 ev->ae_name);
+				 evp->ae_name);
 		} else {
 			ctr++;
 		}
-		free(ev->ae_name);
-		free(ev->ae_desc);
-		free(ev);
 	}
 	endauevent();
+	free(ev.ae_name);
+	free(ev.ae_desc);
 	if (ctr == 0)
 		syslog(LOG_ERR, "No events to class mappings registered.");
 	else