From owner-p4-projects@FreeBSD.ORG  Fri Apr 22 19:18:36 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A8F616A4D0; Fri, 22 Apr 2005 19:18:36 +0000 (GMT)
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 5E48716A4CE
	for <perforce@freebsd.org>; Fri, 22 Apr 2005 19:18:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 40F5A43D3F
	for <perforce@freebsd.org>; Fri, 22 Apr 2005 19:18:36 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3MJIarM089727
	for <perforce@freebsd.org>; Fri, 22 Apr 2005 19:18:36 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3MJIZZZ089724
	for perforce@freebsd.org; Fri, 22 Apr 2005 19:18:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 22 Apr 2005 19:18:35 GMT
Message-Id: <200504221918.j3MJIZZZ089724@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 75735 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: Fri, 22 Apr 2005 19:18:37 -0000

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

Change 75735 by rwatson@rwatson_paprika on 2005/04/22 19:17:57

	Replicate from TrustedBSD: Don't expose struct socket to userspace,
	but do it in a FreeBSD or Darwin way.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 edit
.. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#2 (text+ko) ====

@@ -24,9 +24,9 @@
 #ifndef _BSM_AUDIT_H
 #define	_BSM_AUDIT_H
 
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/ucred.h>
-#include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/socket.h>
 #include <sys/cdefs.h>

==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#2 (text+ko) ====

@@ -281,11 +281,13 @@
 token_t			*au_to_return32(char status, u_int32_t ret);
 token_t			*au_to_return64(char status, u_int64_t ret);
 token_t			*au_to_seq(long audit_count);
+#if defined(_KERNEL) || defined(KERNEL)
 token_t			*au_to_socket(struct socket *so);
 token_t			*au_to_socket_ex_32(u_int16_t lp, u_int16_t rp, 
 				struct sockaddr *la, struct sockaddr *ta);
 token_t			*au_to_socket_ex_128(u_int16_t lp, u_int16_t rp, 
 				struct sockaddr *la, struct sockaddr *ta);
+#endif
 token_t			*au_to_sock_inet(struct sockaddr_in *so);
 token_t			*au_to_sock_inet32(struct sockaddr_in *so);
 token_t			*au_to_sock_inet128(struct sockaddr_in6 *so);