From owner-p4-projects@FreeBSD.ORG Sat Jul 8 12:10:35 2006 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 E4ABC16A4DF; Sat, 8 Jul 2006 12:10:34 +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 8EFDE16A4DE for ; Sat, 8 Jul 2006 12:10:34 +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 5013743D46 for ; Sat, 8 Jul 2006 12:10:34 +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.6/8.13.6) with ESMTP id k68CAYGg057216 for ; Sat, 8 Jul 2006 12:10:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k68CAXTq057210 for perforce@freebsd.org; Sat, 8 Jul 2006 12:10:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 8 Jul 2006 12:10:33 GMT Message-Id: <200607081210.k68CAXTq057210@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 100982 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: Sat, 08 Jul 2006 12:10:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=100982 Change 100982 by rwatson@rwatson_zoo on 2006/07/08 12:09:59 More use of mount label instead of fslabel. Further rename socket_peer label calls to be more consistent. More comments on renaming. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#22 (text+ko) ==== @@ -149,7 +149,7 @@ typedef void (*mpo_devfs_init_label_t)(struct label *label); typedef void (*mpo_devfs_destroy_label_t)(struct label *label); typedef void (*mpo_devfs_vnode_associate_t)(struct mount *mp, - struct label *fslabel, struct devfs_dirent *de, + struct label *mountlabel, struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vlabel); typedef void (*mpo_devfs_create_device_t)(struct ucred *cred, @@ -463,10 +463,10 @@ * Object: struct socket (Socket) */ typedef int (*mpo_socket_init_label_t)(struct label *label, int flag); -typedef int (*mpo_socket_init_peer_label_t)(struct label *label, +typedef int (*mpo_socket_peer_init_label_t)(struct label *label, int flag); typedef void (*mpo_socket_destroy_label_t)(struct label *label); -typedef void (*mpo_socket_destroy_peer_label_t)(struct label *label); +typedef void (*mpo_socket_peer_destroy_label_t)(struct label *label); typedef void (*mpo_socket_copy_label_t)(struct label *src, struct label *dest); typedef int (*mpo_socket_externalize_label_t)(struct label *label, @@ -543,13 +543,13 @@ typedef void (*mpo_vnode_init_label_t)(struct label *label); typedef void (*mpo_vnode_destroy_label_t)(struct label *label); typedef int (*mpo_vnode_associate_extattr_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, + struct label *mountlabel, struct vnode *vp, struct label *vlabel); typedef void (*mpo_vnode_associate_singlelabel_t)(struct mount *mp, - struct label *fslabel, struct vnode *vp, + struct label *mountlabel, struct vnode *vp, struct label *vlabel); typedef int (*mpo_vnode_create_extattr_t)(struct ucred *cred, - struct mount *mp, struct label *fslabel, + struct mount *mp, struct label *mountlabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp); @@ -697,6 +697,9 @@ /* * XXXRW: Names here still inconsistent. + * + * Perhaps mpo_ifnet_receive(), mpo_ifnet_receive_encap(), and + * mpo_ifnet_transmit(). */ mpo_ifnet_init_label_t mpo_ifnet_init_label; mpo_ifnet_destroy_label_t mpo_ifnet_destroy_label; @@ -838,9 +841,9 @@ * be best if the "peer" label were at the protocol layer. */ mpo_socket_init_label_t mpo_socket_init_label; - mpo_socket_init_peer_label_t mpo_socket_init_peer_label; + mpo_socket_peer_init_label_t mpo_socket_peer_init_label; mpo_socket_destroy_label_t mpo_socket_destroy_label; - mpo_socket_destroy_peer_label_t mpo_socket_destroy_peer_label; + mpo_socket_peer_destroy_label_t mpo_socket_peer_destroy_label; mpo_socket_copy_label_t mpo_socket_copy_label; mpo_socket_externalize_label_t mpo_socket_externalize_label; mpo_socket_peer_externalize_label_t mpo_socket_peer_externalize_label;