From 2197c8b41423a7a9a5e55db0d3a5a27131966e72 Mon Sep 17 00:00:00 2001 From: Rajesh Amaravathi Date: Tue, 5 Feb 2013 16:52:16 +0530 Subject: nfs/nlm: use req's uid and gid for open_and_resume Previously, NLM was setting the frame->root->{uid,gid} to root by default. This causes permission problems with root squashing for lock calls. Now, we obtain the uid and gid from rpc request. And duplicate #defines are removed from rpcsvc.h Change-Id: I5d6c87aed8d04aab2619bb913408048c0a02d1e7 BUG: 906884 Signed-off-by: Rajesh Amaravathi Reviewed-on: http://review.gluster.org/4466 Reviewed-by: Niels de Vos Tested-by: Gluster Build System Reviewed-by: Anand Avati --- rpc/rpc-lib/src/rpcsvc.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'rpc') diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index c0cb7fca..7fdeaeb0 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -244,8 +244,6 @@ struct rpcsvc_request { #define rpcsvc_request_program_private(req) (((rpcsvc_program_t *)((req)->prog))->private) #define rpcsvc_request_accepted(req) ((req)->rpc_status == MSG_ACCEPTED) #define rpcsvc_request_accepted_success(req) ((req)->rpc_err == SUCCESS) -#define rpcsvc_request_uid(req) ((req)->uid) -#define rpcsvc_request_gid(req) ((req)->gid) #define rpcsvc_request_prog_minauth(req) (rpcsvc_request_program(req)->min_auth) #define rpcsvc_request_cred_flavour(req) (rpcsvc_auth_flavour(req->cred)) #define rpcsvc_request_verf_flavour(req) (rpcsvc_auth_flavour(req->verf)) -- cgit