PERFORCE change 96306 for review

[Robert Watson]

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

Change 96306 by rwatson at 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 {
 	/*