From a21fad22e004e0ea740a93a97eae018ade9a71a6 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 31 May 1998 19:00:19 +0000
Subject: Don't pass a second copy of the uid/gid in with the v2/v3 sattr
 structures, it just makes more work.  We pass a copy of the uid/gid with the
 credentials.  (although, this may need to be revisited if a non AUTHUNIX
 authentication method (such as NFSKERB) ever gets implemented).

Obtained from:  NetBSD
---
 sys/nfsserver/nfsm_subs.h | 10 ++++------
 sys/nfsserver/nfsproto.h  |  8 +++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'sys/nfsserver')

diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index efba82b..bb254a2 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.18 1998/05/31 17:48:07 peter Exp $
+ * $Id: nfsm_subs.h,v 1.19 1998/05/31 18:19:43 peter Exp $
  */
 
 
@@ -235,13 +235,11 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			(f) = ttattrf; \
 		} }
 
-#define nfsm_v3sattr(s, a, u, g) \
+#define nfsm_v3sattr(s, a) \
 		{ (s)->sa_modetrue = nfs_true; \
 		(s)->sa_mode = vtonfsv3_mode((a)->va_mode); \
-		(s)->sa_uidtrue = nfs_true; \
-		(s)->sa_uid = txdr_unsigned(u); \
-		(s)->sa_gidtrue = nfs_true; \
-		(s)->sa_gid = txdr_unsigned(g); \
+		(s)->sa_uidfalse = nfs_false; \
+		(s)->sa_gidfalse = nfs_false; \
 		(s)->sa_sizefalse = nfs_false; \
 		(s)->sa_atimetype = txdr_unsigned(NFSV3SATTRTIME_TOCLIENT); \
 		txdr_nfsv3time(&(a)->va_atime, &(s)->sa_atime); \
diff --git a/sys/nfsserver/nfsproto.h b/sys/nfsserver/nfsproto.h
index ada9926..9ada127 100644
--- a/sys/nfsserver/nfsproto.h
+++ b/sys/nfsserver/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.3 1997/02/22 09:42:50 peter Exp $
+ * $Id: nfsproto.h,v 1.4 1998/05/31 17:27:58 peter Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
@@ -371,10 +371,8 @@ struct nfsv2_sattr {
 struct nfsv3_sattr {
 	u_long		sa_modetrue;
 	u_long		sa_mode;
-	u_long		sa_uidtrue;
-	u_long		sa_uid;
-	u_long		sa_gidtrue;
-	u_long		sa_gid;
+	u_long		sa_uidfalse;
+	u_long		sa_gidfalse;
 	u_long		sa_sizefalse;
 	u_long		sa_atimetype;
 	nfstime3	sa_atime;
-- 
cgit v1.1