From 49be10947ff6deab3c4e581f286c96cd2545a682 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 7 Jan 2008 21:16:56 -0500 Subject: [PATCH] --- yaml --- r: 79661 b: refs/heads/master c: 86d61d8638ddf9cdf87df26c7fa69b2804425fbe h: refs/heads/master i: 79659: e20bdd98bde2061066ea05aebc3588f06e96a6a8 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/rpcb_clnt.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c246b9577755..e80b8e339769 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b454ae906085cf7774fb4756746680c9b03b6f84 +refs/heads/master: 86d61d8638ddf9cdf87df26c7fa69b2804425fbe diff --git a/trunk/net/sunrpc/rpcb_clnt.c b/trunk/net/sunrpc/rpcb_clnt.c index b60fa92321a5..a6cd35883fa7 100644 --- a/trunk/net/sunrpc/rpcb_clnt.c +++ b/trunk/net/sunrpc/rpcb_clnt.c @@ -73,9 +73,9 @@ struct rpcbind_args { u32 r_vers; u32 r_prot; unsigned short r_port; - char * r_netid; - char r_addr[RPCBIND_MAXUADDRLEN]; - char * r_owner; + const char * r_netid; + const char * r_addr; + const char * r_owner; }; static struct rpc_procinfo rpcb_procedures2[]; @@ -358,10 +358,8 @@ void rpcb_getport_async(struct rpc_task *task) map->r_prot = xprt->prot; map->r_port = 0; map->r_xprt = xprt_get(xprt); - map->r_netid = (char *)rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); - memcpy(map->r_addr, - rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR), - sizeof(map->r_addr)); + map->r_netid = rpc_peeraddr2str(clnt, RPC_DISPLAY_NETID); + map->r_addr = rpc_peeraddr2str(rpcb_clnt, RPC_DISPLAY_UNIVERSAL_ADDR); map->r_owner = RPCB_OWNER_STRING; /* ignored for GETADDR */ child = rpcb_call_async(rpcb_clnt, map, xprt->bind_index);