diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-22 11:26:34 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-22 11:26:34 +0000 |
| commit | a8fc6e2831f6c04c7b16a8eac45dd17c320f3003 (patch) | |
| tree | dfde271fd6ffc665950e5b21685e5eddaef4a64e /src/lib/rpc/pmap_rmt.c | |
| parent | 4827b2bbbd815a8b677527ea0cef45952a19039f (diff) | |
| download | krb5-a8fc6e2831f6c04c7b16a8eac45dd17c320f3003.tar.gz krb5-a8fc6e2831f6c04c7b16a8eac45dd17c320f3003.tar.xz krb5-a8fc6e2831f6c04c7b16a8eac45dd17c320f3003.zip | |
* svc_simple.c (universal): Change transp to s_transp to not
shadow filewide static definition of name.
Move file wide definition of "pl" into respective functions.
* pmap_rmt.c: Change sin->sockin and socket->sock.
* pmap_getmaps.c, pmap_getport.c: Change socket to sock to not
shadow network function.
* bindresvport.c, clnt_generic.c: Change sin to sockin to not
shadow function declaration.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13486 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc/pmap_rmt.c')
| -rw-r--r-- | src/lib/rpc/pmap_rmt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c index faa1fc206..401fd80b6 100644 --- a/src/lib/rpc/pmap_rmt.c +++ b/src/lib/rpc/pmap_rmt.c @@ -79,14 +79,14 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt struct timeval tout; rpc_u_int32 *port_ptr; { - int socket = -1; + int sock = -1; register CLIENT *client; struct rmtcallargs a; struct rmtcallres r; enum clnt_stat stat; addr->sin_port = htons(PMAPPORT); - client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &socket); + client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &sock); if (client != (CLIENT *)NULL) { a.prog = prog; a.vers = vers; @@ -102,7 +102,7 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt } else { stat = RPC_FAILED; } - (void)close(socket); + (void)close(sock); addr->sin_port = 0; return (stat); } @@ -176,7 +176,7 @@ getbroadcastnets(addrs, sock, buf) { struct ifconf ifc; struct ifreq ifreq, *ifr; - struct sockaddr_in *sin; + struct sockaddr_in *sockin; int n, i; ifc.ifc_len = GIFCONF_BUFSIZE; @@ -196,16 +196,16 @@ getbroadcastnets(addrs, sock, buf) if ((ifreq.ifr_flags & IFF_BROADCAST) && (ifreq.ifr_flags & IFF_UP) && ifr->ifr_addr.sa_family == AF_INET) { - sin = (struct sockaddr_in *)&ifr->ifr_addr; + sockin = (struct sockaddr_in *)&ifr->ifr_addr; #ifdef SIOCGIFBRDADDR /* 4.3BSD */ if (ioctl(sock, SIOCGIFBRDADDR, (char *)&ifreq) < 0) { addrs[i++].s_addr = INADDR_ANY; #if 0 /* this is uuuuugly */ addrs[i++] = inet_makeaddr(inet_netof #if defined(hpux) || (defined(sun) && defined(__svr4__)) || defined(linux) || (defined(__osf__) && defined(__alpha__)) - (sin->sin_addr), + (sockin->sin_addr), #else /* hpux or solaris */ - (sin->sin_addr.s_addr), + (sockin->sin_addr.s_addr), #endif INADDR_ANY); #endif @@ -215,7 +215,7 @@ getbroadcastnets(addrs, sock, buf) } #else /* 4.2 BSD */ addrs[i++] = inet_makeaddr(inet_netof - (sin->sin_addr.s_addr), INADDR_ANY); + (sockin->sin_addr.s_addr), INADDR_ANY); #endif } } |