d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace the global references to "hostid" in svc_rpcsec_gss.c to local

Browse Source 
variables set via the getcredhostid() function. I also changed the type
of ci_hostid to "unsigned long" so that it matches what is returned by
getcredhostid(). Although "struct svc_rpc_gss_clientid" goes on the wire
during RPCSEC_GSS, it is just a variable # of opaque bytes to the client,
so it doesn't matter how much storage ci_hostid uses.

Approved by:	kib (mentor)
This commit is contained in:
Rick Macklem 2009-06-15 14:44:55 +00:00
parent bb74c2db4d
commit ae883d554a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
View File

@ -65,12 +65,14 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/jail.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/sx.h>
#include <sys/ucred.h>
@ -121,7 +123,7 @@ enum svc_rpc_gss_client_state {
#define SVC_RPC_GSS_SEQWINDOW 128
struct svc_rpc_gss_clientid {
uint32_t ci_hostid;
unsigned long ci_hostid;
uint32_t ci_boottime;
uint32_t ci_id;
};
@ -505,9 +507,11 @@ svc_rpc_gss_find_client(struct svc_rpc_gss_clientid *id)
{
struct svc_rpc_gss_client *client;
struct svc_rpc_gss_client_list *list;
unsigned long hostid;
rpc_gss_log_debug("in svc_rpc_gss_find_client(%d)", id->ci_id);
getcredhostid(curthread->td_ucred, &hostid);
if (id->ci_hostid != hostid || id->ci_boottime != boottime.tv_sec)
return (NULL);
@ -536,6 +540,7 @@ svc_rpc_gss_create_client(void)
{
struct svc_rpc_gss_client *client;
struct svc_rpc_gss_client_list *list;
unsigned long hostid;
rpc_gss_log_debug("in svc_rpc_gss_create_client()");
@ -543,6 +548,7 @@ svc_rpc_gss_create_client(void)
memset(client, 0, sizeof(struct svc_rpc_gss_client));
refcount_init(&client->cl_refs, 1);
sx_init(&client->cl_lock, "GSS-client");
getcredhostid(curthread->td_ucred, &hostid);
client->cl_id.ci_hostid = hostid;
client->cl_id.ci_boottime = boottime.tv_sec;
client->cl_id.ci_id = svc_rpc_gss_next_clientid++;