From owner-p4-projects@FreeBSD.ORG Mon Nov 3 12:11:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D998A16A4D0; Mon, 3 Nov 2003 12:11:54 -0800 (PST) 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 B4FDF16A4CE for ; Mon, 3 Nov 2003 12:11:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D8B943FAF for ; Mon, 3 Nov 2003 12:11:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA3KBsXJ079330 for ; Mon, 3 Nov 2003 12:11:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA3KBrwP079327 for perforce@freebsd.org; Mon, 3 Nov 2003 12:11:53 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Nov 2003 12:11:53 -0800 (PST) Message-Id: <200311032011.hA3KBrwP079327@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 Subject: PERFORCE change 41228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Nov 2003 20:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=41228 Change 41228 by rwatson@rwatson_tislabs on 2003/11/03 12:10:55 Synchronize to version comitted to main FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#9 (text+ko) ==== @@ -32,6 +32,8 @@ * 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: src/sys/security/mac/mac_internal.h,v 1.103 2003/10/25 15:28:20 rwatson Exp $ */ /* @@ -48,6 +50,7 @@ * MAC Framework global types and typedefs. */ LIST_HEAD(mac_policy_list_head, mac_policy_conf); +MALLOC_DECLARE(M_MACTEMP); /* * MAC Framework global variables. @@ -63,11 +66,6 @@ #endif /* - * MAC Framework global types and constants. - */ -MALLOC_DECLARE(M_MACTEMP); - -/* * MAC Framework object/access counter primitives, conditionally * compiled. */ @@ -109,7 +107,6 @@ int mac_internalize_cred_label(struct label *label, char *string); void mac_relabel_cred(struct ucred *cred, struct label *newlabel); - void mac_copy_pipe_label(struct label *src, struct label *dest); void mac_destroy_pipe_label(struct label *label); int mac_externalize_pipe_label(struct label *label, char *elements,