From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 16:17:15 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C1B716A4E1; Thu,  6 Jul 2006 16:17:15 +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 0262C16A4DE
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 16:17:15 +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 BAA4143D46
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 16:17:14 +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 k66GHECi097406
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 16:17:14 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 k66GHELp097403
	for perforce@freebsd.org; Thu, 6 Jul 2006 16:17:14 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 Jul 2006 16:17:14 GMT
Message-Id: <200607061617.k66GHELp097403@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100769 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jul 2006 16:17:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=100769

Change 100769 by rwatson@rwatson_zoo on 2006/07/06 16:17:09

	Rename of userret function premature.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#12 (text+ko) ====


==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#20 (text+ko) ====

@@ -363,7 +363,6 @@
 typedef void	(*mpo_proc_destroy_label_t)(struct label *label);
 typedef void	(*mpo_proc_create_init_t)(struct ucred *cred);
 typedef void	(*mpo_proc_create_swapper_t)(struct ucred *cred);
-typedef void	(*mpo_proc_thread_userret_t)(struct thread *thread);
 typedef int	(*mpo_proc_check_debug_t)(struct ucred *cred,
 		    struct proc *proc);
 typedef int	(*mpo_proc_check_sched_t)(struct ucred *cred,
@@ -386,6 +385,7 @@
 		    struct proc *proc, int signum);
 typedef int	(*mpo_proc_check_wait_t)(struct ucred *cred,
 		    struct proc *proc);
+typedef void	(*mpo_thread_userret_t)(struct thread *thread);
 typedef int	(*mpo_associate_nfsd_label_t)(struct ucred *cred);
 
 /*
@@ -784,7 +784,6 @@
 	mpo_proc_destroy_label_t		mpo_proc_destroy_label;
 	mpo_proc_create_init_t			mpo_proc_create_init;
 	mpo_proc_create_swapper_t		mpo_proc_create_swapper;
-	mpo_proc_thread_userret_t		mpo_proc_thread_userret;
 	mpo_proc_check_debug_t			mpo_proc_check_debug;
 	mpo_proc_check_sched_t			mpo_proc_check_sched;
 	mpo_proc_check_setuid_t			mpo_proc_check_setuid;
@@ -798,6 +797,7 @@
 	mpo_proc_check_setresgid_t		mpo_proc_check_setresgid;
 	mpo_proc_check_signal_t			mpo_proc_check_signal;
 	mpo_proc_check_wait_t			mpo_proc_check_wait;
+	mpo_thread_userret_t			mpo_thread_userret;
 
 	mpo_sysvmsq_init_label_t		mpo_sysvmsq_init_label;
 	mpo_sysvmsq_destroy_t			mpo_sysvmsq_destroy;