PERFORCE change 114583 for review
Todd Miller
millert at FreeBSD.org
Thu Feb 15 20:27:10 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=114583
Change 114583 by millert at 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 <security/sebsd/sebsd.h>
#include <security/sebsd/sebsd_syscalls.h>
+#include <security/sebsd/linux-compat.h>
#include <security/sebsd/avc/avc.h>
#include <security/sebsd/ss/services.h>
==== //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 <security/sebsd/linux-compat.h>
-
/*
* 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 {
More information about the p4-projects
mailing list