Merge tag 'v3.11-rc5' into for-3.12 branch
For testing purposes I want some nfs and nfsd bugfixes (specifically,58cd57bfd9
and previous nfsd patches, and Trond's4f3cc4809a
).
This commit is contained in:
@@ -1259,6 +1259,8 @@ static bool svc_rqst_integrity_protected(struct svc_rqst *rqstp)
|
||||
struct svc_cred *cr = &rqstp->rq_cred;
|
||||
u32 service;
|
||||
|
||||
if (!cr->cr_gss_mech)
|
||||
return false;
|
||||
service = gss_pseudoflavor_to_service(cr->cr_gss_mech, cr->cr_flavor);
|
||||
return service == RPC_GSS_SVC_INTEGRITY ||
|
||||
service == RPC_GSS_SVC_PRIVACY;
|
||||
|
Reference in New Issue
Block a user