From owner-p4-projects@FreeBSD.ORG  Fri Jun  3 18:37:10 2005
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 2504016A421; Fri,  3 Jun 2005 18:37:10 +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 E460F16A41C
	for <perforce@freebsd.org>; Fri,  3 Jun 2005 18:37:09 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A64F243D4C
	for <perforce@freebsd.org>; Fri,  3 Jun 2005 18:37:09 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j53Ib9dK073916
	for <perforce@freebsd.org>; Fri, 3 Jun 2005 18:37:09 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j53Ib9NS073913
	for perforce@freebsd.org; Fri, 3 Jun 2005 18:37:09 GMT
	(envelope-from areisse@nailabs.com)
Date: Fri, 3 Jun 2005 18:37:09 GMT
Message-Id: <200506031837.j53Ib9NS073913@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 77936 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: Fri, 03 Jun 2005 18:37:11 -0000

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

Change 77936 by areisse@areisse_ibook on 2005/06/03 18:36:36

	copyinstr wants a size on darwin.
	Fix a couple of build/warning issues related to the new selinux
	pieces.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/security_classes#3 (text+ko) ====

@@ -42,11 +42,6 @@
 
 class mach_port
 
-class port_methods1
-class port_methods2
-class port_methods3
-class port_methods4
-
 #classes only used by name
 
 class mach_task

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.h#3 (text+ko) ====

@@ -40,6 +40,7 @@
 #include <sedarwin/flask_types.h>
 
 #define SELINUX_MAGIC 0xf97cff8c
+#define SEBSD_ID_STRING			"sebsd"
 #define	SEBSD_MAC_EXTATTR_NAME		"sebsd"
 #define	SEBSD_MAC_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
 

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscall.c#4 (text+ko) ====

@@ -209,7 +209,7 @@
 };
 
 static int
-sebsd_get_bools(struct thread *td, struct sebsd_get_bools *gb)
+sebsd_get_bools(struct proc *td, struct sebsd_get_bools *gb)
 {
 	char *out = NULL;
 	if (gb->out)
@@ -314,7 +314,8 @@
 	{
 		char str[128];
 		int  active, pending;
-		err = copyinstr(args,str, 128, NULL);
+		size_t dummy;
+		err = copyinstr(args,str, 128, &dummy);
 		if (err)
 			return (err);
 		security_get_bool(str, &active, &pending);

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd_syscalls.h#3 (text+ko) ====

@@ -1,6 +1,8 @@
 #ifndef _SEBSD_SYSCALLS_H_
 #define _SEBSD_SYSCALLS_H_
 
+#include <sedarwin/linux-compat.h>
+
 /*
  * TBD: Should we really try to line up with SELinux?
  */

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/ss/mach_av.c#2 (text+ko) ====