From owner-trustedbsd-cvs@FreeBSD.ORG Thu Jul 6 10:06:26 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 65DB116A4DF for ; Thu, 6 Jul 2006 10:06:26 +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 2FFA643D45 for ; Thu, 6 Jul 2006 10:06:24 +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 97BD346CF7 for ; Thu, 6 Jul 2006 06:06:23 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C7D1657E17; Thu, 6 Jul 2006 10:06:00 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B8BBA16A4E0; Thu, 6 Jul 2006 10:06:00 +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 7BB3316A4DA for ; Thu, 6 Jul 2006 10:06:00 +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 B3BA743D49 for ; Thu, 6 Jul 2006 10:05:59 +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 k66A5xBV060999 for ; Thu, 6 Jul 2006 10:05:59 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 k66A5xfm060996 for perforce@freebsd.org; Thu, 6 Jul 2006 10:05:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 10:05:59 GMT Message-Id: <200607061005.k66A5xfm060996@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 100709 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: Thu, 06 Jul 2006 10:06:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=100709 Change 100709 by rwatson@rwatson_zoo on 2006/07/06 10:04:59 Two name shortenings/simplifications. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#11 (text+ko) ==== @@ -222,7 +222,7 @@ */ typedef int (*mpo_inpcb_init_label_t)(struct label *label, int flag); typedef void (*mpo_inpcb_destroy_label_t)(struct label *label); -typedef void (*mpo_inpcb_create_from_socket_t)(struct socket *so, +typedef void (*mpo_inpcb_create_t)(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel); typedef void (*mpo_inpcb_create_mbuf_t)(struct inpcb *inp, @@ -474,7 +474,7 @@ char *element_name, char *element_data, int *claimed); typedef void (*mpo_socket_create_t)(struct ucred *cred, struct socket *so, struct label *socketlabel); -typedef void (*mpo_socket_create_from_socket_t)(struct socket *oldsocket, +typedef void (*mpo_socket_accept_t)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel); typedef void (*mpo_socket_relabel_t)(struct ucred *cred, struct socket *so, @@ -711,12 +711,9 @@ mpo_ifnet_check_relabel_t mpo_ifnet_check_relabel; mpo_ifnet_check_transmit_t mpo_ifnet_check_transmit; - /* - * XXXRW: Could s/create_from_socket/create/. - */ mpo_inpcb_init_label_t mpo_inpcb_init_label; mpo_inpcb_destroy_label_t mpo_inpcb_destroy_label; - mpo_inpcb_create_from_socket_t mpo_inpcb_create_from_socket; + mpo_inpcb_create_t mpo_inpcb_create; mpo_inpcb_create_mbuf_t mpo_inpcb_create_mbuf; mpo_inpcb_sosetlabel_t mpo_inpcb_sosetlabel; mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; @@ -865,7 +862,7 @@ mpo_socket_externalize_peer_label_t mpo_socket_externalize_peer_label; mpo_socket_internalize_label_t mpo_socket_internalize_label; mpo_socket_create_t mpo_socket_create; - mpo_socket_create_from_socket_t mpo_socket_create_from_socket; + mpo_socket_accept_t mpo_socket_accept; mpo_socket_relabel_t mpo_socket_relabel; mpo_socket_set_peer_from_socket_t mpo_socket_set_peer_from_socket; mpo_socket_create_mbuf_t mpo_socket_create_mbuf;