svn commit: r223829 - stable/8/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Thu Jul  7 00:14:20 2011
New Revision: 223829
URL: http://svn.freebsd.org/changeset/base/223829

Log:
  MFC: r223436
  Fix the new NFSv4 client so that it uses the same uid as
  was used for doing a mount when performing system operations
  on AUTH_SYS mounts.  This resolved an issue when mounting
  a Linux server. Found during testing at the recent
  NFSv4 interoperability Bakeathon.

Modified:
  stable/8/sys/fs/nfs/nfs_commonkrpc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonkrpc.c	Wed Jul  6 22:38:09 2011	(r223828)
+++ stable/8/sys/fs/nfs/nfs_commonkrpc.c	Thu Jul  7 00:14:20 2011	(r223829)
@@ -503,6 +503,20 @@ newnfs_request(struct nfsrv_descript *nd
 		else
 			secflavour = RPCSEC_GSS_KRB5;
 		srv_principal = NFSMNT_SRVKRBNAME(nmp);
+	} else if (nmp != NULL && !NFSHASKERB(nmp) &&
+	    nd->nd_procnum != NFSPROC_NULL &&
+	    (nd->nd_flag & ND_USEGSSNAME) != 0) {
+		/*
+		 * Use the uid that did the mount when the RPC is doing
+		 * NFSv4 system operations, as indicated by the
+		 * ND_USEGSSNAME flag, for the AUTH_SYS case.
+		 */
+		saved_uid = cred->cr_uid;
+		if (nmp->nm_uid != (uid_t)-1)
+			cred->cr_uid = nmp->nm_uid;
+		else
+			cred->cr_uid = 0;
+		set_uid = 1;
 	}
 
 	if (nmp != NULL) {