From owner-p4-projects@FreeBSD.ORG  Fri Apr 28 13:03:52 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 E73AB16A401; Fri, 28 Apr 2006 13:03:51 +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 9BF1A16A402
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:03:51 +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 5A73543D4C
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:03:51 +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.1/8.13.1) with ESMTP id k3SD3pft099940
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 13:03:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3SD3ohp099899
	for perforce@freebsd.org; Fri, 28 Apr 2006 13:03:50 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 28 Apr 2006 13:03:50 GMT
Message-Id: <200604281303.k3SD3ohp099899@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 96306 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: Fri, 28 Apr 2006 13:03:52 -0000

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

Change 96306 by rwatson@rwatson_zoo on 2006/04/28 13:03:38

	Correct merge error in return type: associate_nfsd does not have a
	return value since it must succeed.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#243 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#243 (text+ko) ====

@@ -597,7 +597,7 @@
 typedef int	(*mpo_check_vnode_write_t)(struct ucred *active_cred,
 		    struct ucred *file_cred, struct vnode *vp,
 		    struct label *label);
-typedef int	(*mpo_associate_nfsd_label_t)(struct ucred *cred);
+typedef void	(*mpo_associate_nfsd_label_t)(struct ucred *cred);
 
 struct mac_policy_ops {
 	/*