Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e097258f authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

nfsd: Remove nfsd_luid, nfsd_lgid, nfsd_ruid and nfsd_rgid 



These trivial macros that don't currently do anything are the last
vestiages of an old attempt at uid mapping that was removed from the
kernel in September of 2002.  Remove them to make it clear what the
code is currently doing.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 65e10f6d

fs/nfsd/auth.h

+0 −6
Original line number Diff line number Diff line 
/*

 * nfsd-specific authentication stuff.

 * uid/gid mapping not yet implemented.

 *

 * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>

 */
@@ -8,11 +7,6 @@ 
#ifndef LINUX_NFSD_AUTH_H

#define LINUX_NFSD_AUTH_H



#define nfsd_luid(rq, uid)	((u32)(uid))

#define nfsd_lgid(rq, gid)	((u32)(gid))

#define nfsd_ruid(rq, uid)	((u32)(uid))

#define nfsd_rgid(rq, gid)	((u32)(gid))



/*

 * Set the current process's fsuid/fsgid etc to those of the NFS

 * client user

fs/nfsd/nfs3xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ encode_fattr3(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, 
	*p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]);

	*p++ = htonl((u32) stat->mode);

	*p++ = htonl((u32) stat->nlink);

	*p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));

	*p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));

	*p++ = htonl((u32) stat->uid);

	*p++ = htonl((u32) stat->gid);

	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {

		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);

	} else {

fs/nfsd/nfsxdr.c

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, 
	*p++ = htonl(nfs_ftypes[type >> 12]);

	*p++ = htonl((u32) stat->mode);

	*p++ = htonl((u32) stat->nlink);

	*p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid));

	*p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid));

	*p++ = htonl((u32) stat->uid);

	*p++ = htonl((u32) stat->gid);



	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {

		*p++ = htonl(NFS_MAXPATHLEN);