From owner-trustedbsd-cvs@FreeBSD.ORG Wed May 17 18:48:48 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 08A1016A437
for <trustedbsd-cvs@freebsd.org>; Wed, 17 May 2006 18:48:48 +0000 (UTC)
(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
by mx1.FreeBSD.org (Postfix) with ESMTP id BDAF643D5C
for <trustedbsd-cvs@freebsd.org>; Wed, 17 May 2006 18:47:24 +0000 (GMT)
(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
by cyrus.watson.org (Postfix) with ESMTP id A6F1D46D2D
for <trustedbsd-cvs@trustedbsd.org>;
Wed, 17 May 2006 14:47:23 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
by mx2.freebsd.org (Postfix) with ESMTP id DBE3553FA1;
Wed, 17 May 2006 18:47:05 +0000 (GMT)
(envelope-from owner-perforce@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: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Wed, 17 May 2006 18:48:48 -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);