From owner-p4-projects@FreeBSD.ORG Thu Feb 15 20:27:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0273C16A407; Thu, 15 Feb 2007 20:27:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D44F016A402 for ; Thu, 15 Feb 2007 20:27:09 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C3AA113C4B2 for ; Thu, 15 Feb 2007 20:27:09 +0000 (UTC) (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 l1FKR9sn073649 for ; Thu, 15 Feb 2007 20:27:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1FKR9Fm073646 for perforce@freebsd.org; Thu, 15 Feb 2007 20:27:09 GMT (envelope-from millert@freebsd.org) Date: Thu, 15 Feb 2007 20:27:09 GMT Message-Id: <200702152027.l1FKR9Fm073646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 114583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Feb 2007 20:27:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=114583 Change 114583 by millert@millert_p4 on 2007/02/15 20:26:37 Remove linux-specific types from sebsd_syscalls.h, use BSD-style bit types instead. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscall.c#10 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include #include ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd_syscalls.h#9 (text+ko) ==== @@ -1,8 +1,46 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ -#include - /* * TBD: Should we really try to line up with SELinux? */ @@ -16,19 +54,19 @@ /* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - u16 tclass; - u32 requested; + char *scontext; + char *tcontext; + u_int16_t tclass; + u_int32_t requested; }; struct security_response { - u32 allowed; - u32 decided; - u32 auditallow; - u32 auditdeny; - u32 notify; - u32 seqno; + u_int32_t allowed; + u_int32_t decided; + u_int32_t auditallow; + u_int32_t auditdeny; + u_int32_t notify; + u_int32_t seqno; }; struct sebsd_get_bools {