From owner-p4-projects@FreeBSD.ORG  Wed May 17 18:47:06 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 D11BD16B04E; Wed, 17 May 2006 18:47:05 +0000 (UTC)
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 9014E16B04B
	for <perforce@freebsd.org>; Wed, 17 May 2006 18:47:05 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 73DBF43D6B
	for <perforce@freebsd.org>; Wed, 17 May 2006 18:46:54 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4HIkW4m042348
	for <perforce@freebsd.org>; Wed, 17 May 2006 18:46:32 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HIkW1x042345
	for perforce@freebsd.org; Wed, 17 May 2006 18:46:32 GMT
	(envelope-from millert@freebsd.org)
Date: Wed, 17 May 2006 18:46:32 GMT
Message-Id: <200605171846.k4HIkW1x042345@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97361 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, 17 May 2006 18:47:07 -0000

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

Change 97361 by millert@millert_ibook on 2006/05/17 18:46:12

	Remove userland sebsd.h

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/getcon.c#4 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_migscs.c#2 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/sebsd.h#2 delete
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/setcon.c#2 edit

Differences ...

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

@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "policy.h"
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 #include <sys/mac.h>
 
 int getcon_raw(security_context_t *context)
@@ -16,7 +14,7 @@
         int error;
 	int ret = 0;
 
-        error = mac_prepare(&label, SEBSD_ID_STRING);
+        error = mac_prepare(&label, "sebsd");
 	if (error)
 		return -1;
         error = mac_get_proc(label);

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

@@ -3,7 +3,6 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sedarwin/sebsd_syscalls.h>
-#include <sedarwin/sebsd.h>
 
 int
 selinux_load_migscs(const char *path)
@@ -23,5 +22,5 @@
         if (fread(la.data, la.len, 1, fp) != 1)
                 return (EIO);
 
-        return (mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_MIGSCS, &la));
+        return (mac_syscall("sebsd", SEBSDCALL_LOAD_MIGSCS, &la));
 }

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libselinux/src/load_policy.c#3 (text+ko) ====

@@ -16,8 +16,6 @@
 #include <sepol/policydb.h>
 #include "policy.h"
 #include <limits.h>
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 #include <sedarwin/sebsd_syscalls.h>
 
 int security_load_policy(void *data, size_t len)
@@ -26,7 +24,7 @@
 
         la.len = len;
         la.data = data;
-        return mac_syscall(SEBSD_ID_STRING, SEBSDCALL_LOAD_POLICY, &la);
+        return mac_syscall("sebsd", SEBSDCALL_LOAD_POLICY, &la);
 }
 hidden_def(security_load_policy)
 

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

@@ -7,15 +7,13 @@
 #include <string.h>
 #include "selinux_internal.h"
 #include <sys/mac.h>
-#include <sedarwin/linux-compat.h>
-#include <sedarwin/sebsd.h>
 
 int setcon_raw(security_context_t context)
 {
 	mac_t label;
 	int error;
 	
-	error = mac_prepare(&label, SEBSD_ID_STRING);
+	error = mac_prepare(&label, "sebsd");
 	if (error)
 		return -1;
 	error = mac_from_text(&label, context);