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

Commit 78ea323b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Don't use cred->cr_ops->cr_name in nfs4_proc_setclientid() 



With the recent change to generic creds, we can no longer use
cred->cr_ops->cr_name to distinguish between RPCSEC_GSS principals and
AUTH_SYS/AUTH_NULL identities. Replace it with the rpc_authops->au_name
instead...

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 44109241

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2885,7 +2885,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short po 
							RPC_DISPLAY_ADDR),

				rpc_peeraddr2str(clp->cl_rpcclient,

							RPC_DISPLAY_PROTO),

				cred->cr_ops->cr_name,

				clp->cl_rpcclient->cl_auth->au_ops->au_name,

				clp->cl_id_uniquifier);

		setclientid.sc_netid_len = scnprintf(setclientid.sc_netid,

				sizeof(setclientid.sc_netid),

include/linux/sunrpc/auth.h

+0 −2
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ struct rpc_auth { 
struct rpc_authops {

	struct module		*owner;

	rpc_authflavor_t	au_flavor;	/* flavor (RPC_AUTH_*) */

#ifdef RPC_DEBUG

	char *			au_name;

#endif

	struct rpc_auth *	(*create)(struct rpc_clnt *, rpc_authflavor_t);

	void			(*destroy)(struct rpc_auth *);

net/sunrpc/auth_generic.c

+0 −2
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ static struct rpc_cred_cache generic_cred_cache = { 


static const struct rpc_authops generic_auth_ops = {

	.owner = THIS_MODULE,

#ifdef RPC_DEBUG

	.au_name = "Generic",

#endif

	.lookup_cred = generic_lookup_cred,

	.crcreate = generic_create_cred,

};

net/sunrpc/auth_gss/auth_gss.c

+0 −2
Original line number Diff line number Diff line
@@ -1287,9 +1287,7 @@ gss_unwrap_resp(struct rpc_task *task, 
static const struct rpc_authops authgss_ops = {

	.owner		= THIS_MODULE,

	.au_flavor	= RPC_AUTH_GSS,

#ifdef RPC_DEBUG

	.au_name	= "RPCSEC_GSS",

#endif

	.create		= gss_create,

	.destroy	= gss_destroy,

	.lookup_cred	= gss_lookup_cred,

net/sunrpc/auth_null.c

+0 −2
Original line number Diff line number Diff line
@@ -104,9 +104,7 @@ nul_validate(struct rpc_task *task, __be32 *p) 
const struct rpc_authops authnull_ops = {

	.owner		= THIS_MODULE,

	.au_flavor	= RPC_AUTH_NULL,

#ifdef RPC_DEBUG

	.au_name	= "NULL",

#endif

	.create		= nul_create,

	.destroy	= nul_destroy,

	.lookup_cred	= nul_lookup_cred,