patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / net / sunrpc / auth.c

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 315b162..694301a 100644 (file)
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -14,6 +14,7 @@
 #include <linux/socket.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/spinlock.h>
+#include <linux/vserver/xid.h>
 
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY       RPCDBG_AUTH
@@ -259,8 +260,8 @@ rpcauth_lookupcred(struct rpc_auth *auth, int taskflags)
        struct rpc_cred *ret;
 
        get_group_info(current->group_info);
-       acred.uid = current->fsuid;
-       acred.gid = current->fsgid;
+       acred.uid = XIDINO_UID(current->fsuid, current->xid);
+       acred.gid = XIDINO_GID(current->fsgid, current->xid);
        acred.group_info = current->group_info;
 
        dprintk("RPC:     looking up %s cred\n",
@@ -278,8 +279,8 @@ rpcauth_bindcred(struct rpc_task *task)
        struct rpc_cred *ret;
 
        get_group_info(current->group_info);
-       acred.uid = current->fsuid;
-       acred.gid = current->fsgid;
+       acred.uid = XIDINO_UID(current->fsuid, current->xid);
+       acred.gid = XIDINO_GID(current->fsgid, current->xid);
        acred.group_info = current->group_info;
 
        dprintk("RPC: %4d looking up %s cred\n",