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

Commit 68c97153 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Clean up the RPCSEC_GSS service ticket requests 



Instead of hacking specific service names into gss_encode_v1_msg, we should
just allow the caller to specify the service name explicitly.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 805a6af8

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_ 
	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];

#endif

	cred = rpc_lookup_machine_cred();

	cred = rpc_lookup_machine_cred("*");

	if (!IS_ERR(cred))

		clp->cl_machine_cred = cred;

	nfs_fscache_get_client_cookie(clp);

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ int set_callback_cred(void) 
{

	if (callback_cred)

		return 0;

	callback_cred = rpc_lookup_machine_cred();

	callback_cred = rpc_lookup_machine_cred("nfs");

	if (!callback_cred)

		return -ENOMEM;

	return 0;

include/linux/sunrpc/auth.h

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ struct auth_cred { 
	uid_t	uid;

	gid_t	gid;

	struct group_info *group_info;

	const char *principal;

	unsigned char machine_cred : 1;

};
@@ -127,7 +128,7 @@ void rpc_destroy_generic_auth(void); 
void 			rpc_destroy_authunix(void);



struct rpc_cred *	rpc_lookup_cred(void);

struct rpc_cred *	rpc_lookup_machine_cred(void);

struct rpc_cred *	rpc_lookup_machine_cred(const char *service_name);

int			rpcauth_register(const struct rpc_authops *);

int			rpcauth_unregister(const struct rpc_authops *);

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

include/linux/sunrpc/auth_gss.h

+1 −1
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ struct gss_cred { 
	enum rpc_gss_svc	gc_service;

	struct gss_cl_ctx __rcu	*gc_ctx;

	struct gss_upcall_msg	*gc_upcall;

	const char		*gc_principal;

	unsigned long		gc_upcall_timestamp;

	unsigned char		gc_machine_cred : 1;

};



#endif /* __KERNEL__ */

net/sunrpc/auth_generic.c

+4 −2
Original line number Diff line number Diff line
@@ -41,15 +41,17 @@ EXPORT_SYMBOL_GPL(rpc_lookup_cred); 
/*

 * Public call interface for looking up machine creds.

 */

struct rpc_cred *rpc_lookup_machine_cred(void)

struct rpc_cred *rpc_lookup_machine_cred(const char *service_name)

{

	struct auth_cred acred = {

		.uid = RPC_MACHINE_CRED_USERID,

		.gid = RPC_MACHINE_CRED_GROUPID,

		.principal = service_name,

		.machine_cred = 1,

	};



	dprintk("RPC:       looking up machine cred\n");

	dprintk("RPC:       looking up machine cred for service %s\n",

			service_name);

	return generic_auth.au_ops->lookup_cred(&generic_auth, &acred, 0);

}

EXPORT_SYMBOL_GPL(rpc_lookup_machine_cred);