PERFORCE change 89736 for review

[Christian S.J. Peron]

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

Change 89736 by csjp at csjp_xor on 2006/01/15 19:46:01

	Move entry point to after we initialize the UID and GID.
	This may allow policies to make more intelligent decisions
	for labeling.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#23 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#23 (text+ko) ====

@@ -365,13 +365,13 @@
 		}
 		nfsm_adv(nfsm_rndup(len));
 		tl = nfsm_dissect_nonblock(u_int32_t *, 3 * NFSX_UNSIGNED);
-#ifdef MAC
-		mac_associate_nfsd_label(nd->nd_cr);
-#endif
 		nd->nd_cr->cr_uid = nd->nd_cr->cr_ruid =
 		    nd->nd_cr->cr_svuid = fxdr_unsigned(uid_t, *tl++);
 		nd->nd_cr->cr_groups[0] = nd->nd_cr->cr_rgid =
 		    nd->nd_cr->cr_svgid = fxdr_unsigned(gid_t, *tl++);
+#ifdef MAC
+		mac_associate_nfsd_label(nd->nd_cr);
+#endif
 		len = fxdr_unsigned(int, *tl);
 		if (len < 0 || len > RPCAUTH_UNIXGIDS) {
 			m_freem(mrep);