From owner-p4-projects@FreeBSD.ORG Sun Nov 16 08:43:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF51516A4D0; Sun, 16 Nov 2003 08:43:29 -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 C8A8316A4CE for ; Sun, 16 Nov 2003 08:43:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E11A243FAF for ; Sun, 16 Nov 2003 08:43:28 -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 hAGGhSXJ091862 for ; Sun, 16 Nov 2003 08:43:28 -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 hAGGhSes091859 for perforce@freebsd.org; Sun, 16 Nov 2003 08:43:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 16 Nov 2003 08:43:28 -0800 (PST) Message-Id: <200311161643.hAGGhSes091859@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 42551 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: Sun, 16 Nov 2003 16:43:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=42551 Change 42551 by rwatson@rwatson_tislabs on 2003/11/16 08:42:49 Implement mac_copy_{mbuf,pipe,vnode}_label() for mac_stub.c and mac_test.c. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#13 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#122 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#13 (text+ko) ==== @@ -134,6 +134,12 @@ } +static void +stub_copy_label(struct label *src, struct label *dest) +{ + +} + static int stub_externalize_label(struct label *label, char *element_name, struct sbuf *sb, int *claimed) @@ -1320,6 +1326,9 @@ .mpo_destroy_socket_label = stub_destroy_label, .mpo_destroy_socket_peer_label = stub_destroy_label, .mpo_destroy_vnode_label = stub_destroy_label, + .mpo_copy_mbuf_label = stub_copy_label, + .mpo_copy_pipe_label = stub_copy_label, + .mpo_copy_vnode_label = stub_copy_label, .mpo_externalize_cred_label = stub_externalize_label, .mpo_externalize_ifnet_label = stub_externalize_label, .mpo_externalize_pipe_label = stub_externalize_label, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#122 (text+ko) ==== @@ -747,6 +747,30 @@ } } +static void +mac_test_copy_mbuf_label(struct label *src, struct label *dest) +{ + + ASSERT_MBUF_LABEL(src); + ASSERT_MBUF_LABEL(dest); +} + +static void +mac_test_copy_pipe_label(struct label *src, struct label *dest) +{ + + ASSERT_PIPE_LABEL(src); + ASSERT_PIPE_LABEL(dest); +} + +static void +mac_test_copy_vnode_label(struct label *src, struct label *dest) +{ + + ASSERT_VNODE_LABEL(src); + ASSERT_VNODE_LABEL(dest); +} + static int mac_test_externalize_label(struct label *label, char *element_name, struct sbuf *sb, int *claimed) @@ -2293,6 +2317,9 @@ .mpo_destroy_socket_label = mac_test_destroy_socket_label, .mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label, .mpo_destroy_vnode_label = mac_test_destroy_vnode_label, + .mpo_copy_mbuf_label = mac_test_copy_mbuf_label, + .mpo_copy_pipe_label = mac_test_copy_pipe_label, + .mpo_copy_vnode_label = mac_test_copy_vnode_label, .mpo_externalize_cred_label = mac_test_externalize_label, .mpo_externalize_ifnet_label = mac_test_externalize_label, .mpo_externalize_pipe_label = mac_test_externalize_label,