From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 21:40:12 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 650CC16A4D1; Sat, 10 Jan 2004 21:40:12 -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 4127116A4CE
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:40:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2607143D2F
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:40:11 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B5eA0B066956
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 21:40:10 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B5eAVb066953
	for perforce@freebsd.org; Sat, 10 Jan 2004 21:40:10 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 10 Jan 2004 21:40:10 -0800 (PST)
Message-Id: <200401110540.i0B5eAVb066953@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45110 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: Sun, 11 Jan 2004 05:40:12 -0000

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

Change 45110 by rwatson@rwatson_paprika on 2004/01/10 21:39:15

	Make bsm_audit.c compile:
	- Includes
	- Dummy mach functions
	- Unneeded local variable
	- Do return a value if we define a return value.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#5 (text+ko) ====

@@ -22,20 +22,19 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-#include <sys/types.h>
-#include <sys/vnode.h>
+
+#include <sys/param.h>
+#include <sys/audit.h>
+#include <sys/bsm_token.h>
+#include <sys/bsm_kevents.h>
+#include <sys/fcntl.h>
 #include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/socketvar.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/fcntl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/bsm_token.h>
-#include <sys/bsm_kevents.h>
-#include <sys/user.h>
-#include <sys/audit.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/ucred.h>
+#include <sys/vnode.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -44,6 +43,14 @@
 #include <security/audit/kern_audit.h>
 #include <security/audit/bsm_klib.h>
 
+/* XXXDARWIN */
+typedef struct mutex mutex_t;
+#define	kmem_alloc(map, ptrref, size)
+#define	kmem_free(map, ptr, size)
+#define	mutex_alloc(x)	(NULL)
+#define	mutex_lock(x)
+#define	mutex_unlock(x)
+
 /* The number of BSM records allocated. */
 static int bsm_rec_count = 0; 
 
@@ -160,7 +167,6 @@
 	u_char *dptr;
 	size_t tot_rec_size;
 	token_t *cur, *hdr, *trail;
-	int retval = 0;
 		
 	tot_rec_size = rec->len + HEADER_SIZE + TRAILER_SIZE;
 	if(tot_rec_size <= MAX_AUDIT_RECORD_SIZE) {
@@ -185,6 +191,7 @@
 			dptr += cur->len;
 		}
 	}
+	return (0);
 }
 
 /*