git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
nfsd
/
auth.c
diff --git
a/fs/nfsd/auth.c
b/fs/nfsd/auth.c
index
d947261
..
76d42df
100644
(file)
--- a/
fs/nfsd/auth.c
+++ b/
fs/nfsd/auth.c
@@
-9,7
+9,7
@@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
-#include <linux/vs
erver/xid
.h>
+#include <linux/vs
_tag
.h>
#define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
#define CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
@@
-42,22
+42,22
@@
int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
get_group_info(cred.cr_group_info);
if (cred.cr_uid != (uid_t) -1)
get_group_info(cred.cr_group_info);
if (cred.cr_uid != (uid_t) -1)
- current->fsuid = INO
XID_UID(XID
_TAG_NFSD, cred.cr_uid, cred.cr_gid);
+ current->fsuid = INO
TAG_UID(DX
_TAG_NFSD, cred.cr_uid, cred.cr_gid);
else
current->fsuid = exp->ex_anon_uid;
if (cred.cr_gid != (gid_t) -1)
else
current->fsuid = exp->ex_anon_uid;
if (cred.cr_gid != (gid_t) -1)
- current->fsgid = INO
XID_GID(XID
_TAG_NFSD, cred.cr_uid, cred.cr_gid);
+ current->fsgid = INO
TAG_GID(DX
_TAG_NFSD, cred.cr_uid, cred.cr_gid);
else
current->fsgid = exp->ex_anon_gid;
/* this desperately needs a tag :) */
else
current->fsgid = exp->ex_anon_gid;
/* this desperately needs a tag :) */
- current->xid =
INOXID_XID(XID
_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
+ current->xid =
(xid_t)INOTAG_TAG(DX
_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0);
if (!cred.cr_group_info)
return -ENOMEM;
ret = set_current_groups(cred.cr_group_info);
put_group_info(cred.cr_group_info);
if (!cred.cr_group_info)
return -ENOMEM;
ret = set_current_groups(cred.cr_group_info);
put_group_info(cred.cr_group_info);
- if (INO
XID_UID(XID
_TAG_NFSD, cred.cr_uid, cred.cr_gid)) {
+ if (INO
TAG_UID(DX
_TAG_NFSD, cred.cr_uid, cred.cr_gid)) {
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &