From owner-trustedbsd-cvs@FreeBSD.ORG Fri Apr 28 14:32:36 2006 Return-Path: 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 51ABF16A403 for ; Fri, 28 Apr 2006 14:32:36 +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 C4EE143D46 for ; Fri, 28 Apr 2006 14:32:35 +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 567CF46D52 for ; Fri, 28 Apr 2006 10:32:35 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 149FD5540E; Fri, 28 Apr 2006 14:32:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C10D16A404; Fri, 28 Apr 2006 14:32:33 +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 BCC3616A401 for ; Fri, 28 Apr 2006 14:32:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8449C43D46 for ; Fri, 28 Apr 2006 14:32:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3SEWWI6051371 for ; Fri, 28 Apr 2006 14:32:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3SEWVZB051358 for perforce@freebsd.org; Fri, 28 Apr 2006 14:32:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 Apr 2006 14:32:31 GMT Message-Id: <200604281432.k3SEWVZB051358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 96311 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2006 14:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=96311 Change 96311 by rwatson@rwatson_zoo on 2006/04/28 14:30:05 Fix two more merge nits relating to entry points only in the MAC branch and not CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#245 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#245 (text+ko) ==== @@ -322,7 +322,7 @@ typedef void (*mpo_update_ipq_t)(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel); -typedef int (*mpo_update_mbuf_from_cipso)(struct mbuf *m, +typedef int (*mpo_update_mbuf_from_cipso_t)(struct mbuf *m, struct label *mlabel, struct ifnet *ifnet, struct label *ifnetlabel, char *cp, int *code); typedef void (*mpo_inpcb_sosetlabel_t)(struct socket *so, @@ -852,8 +852,8 @@ mpo_check_system_swapon_t mpo_check_system_swapon; mpo_check_system_swapoff_t mpo_check_system_swapoff; mpo_check_system_sysctl_t mpo_check_system_sysctl; - mpo_thread_syscall_enter_t mpo_check_syscall_enter; - mpo_thread_syscall_exit_t mpo_check_syscall_exit; + mpo_thread_syscall_enter_t mpo_thread_syscall_enter; + mpo_thread_syscall_exit_t mpo_thread_syscall_exit; mpo_check_vnode_access_t mpo_check_vnode_access; mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot;